summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
commit8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-misc
parent30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/Manifest.gzbin72929 -> 49167 bytes
-rw-r--r--app-misc/abduco-0.511
-rw-r--r--app-misc/abduco-0.611
-rw-r--r--app-misc/abduco/Manifest5
-rw-r--r--app-misc/abduco/abduco-0.5.ebuild49
-rw-r--r--app-misc/abduco/abduco-0.6.ebuild50
-rw-r--r--app-misc/abduco/metadata.xml19
-rw-r--r--app-misc/abook-0.6.113
-rw-r--r--app-misc/abook-0.6.1-r113
-rw-r--r--app-misc/abook/Manifest5
-rw-r--r--app-misc/abook/abook-0.6.1-r1.ebuild53
-rw-r--r--app-misc/abook/abook-0.6.1.ebuild46
-rw-r--r--app-misc/abook/files/abook-0.6.1-tinfo.patch18
-rw-r--r--app-misc/abook/metadata.xml12
-rw-r--r--app-misc/acdctl-1.111
-rw-r--r--app-misc/acdctl-1.1-r111
-rw-r--r--app-misc/acdctl/Manifest4
-rw-r--r--app-misc/acdctl/acdctl-1.1-r1.ebuild20
-rw-r--r--app-misc/acdctl/acdctl-1.1.ebuild21
-rw-r--r--app-misc/acdctl/metadata.xml10
-rw-r--r--app-misc/actkbd-0.2.8-r211
-rw-r--r--app-misc/actkbd/Manifest6
-rw-r--r--app-misc/actkbd/actkbd-0.2.8-r2.ebuild48
-rw-r--r--app-misc/actkbd/files/actkbd-0.2.7-amd64.patch38
-rw-r--r--app-misc/actkbd/files/actkbd.confd12
-rw-r--r--app-misc/actkbd/files/actkbd.initd31
-rw-r--r--app-misc/actkbd/metadata.xml9
-rw-r--r--app-misc/aldo-0.7.711
-rw-r--r--app-misc/aldo/Manifest3
-rw-r--r--app-misc/aldo/aldo-0.7.7.ebuild22
-rw-r--r--app-misc/aldo/metadata.xml5
-rw-r--r--app-misc/anki-2.1.0_beta2513
-rw-r--r--app-misc/anki-2.1.0_beta2714
-rw-r--r--app-misc/anki/Manifest6
-rw-r--r--app-misc/anki/anki-2.1.0_beta25.ebuild86
-rw-r--r--app-misc/anki/anki-2.1.0_beta27.ebuild86
-rw-r--r--app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch11
-rw-r--r--app-misc/anki/metadata.xml21
-rw-r--r--app-misc/asciinema-2.0.114
-rw-r--r--app-misc/asciinema/Manifest3
-rw-r--r--app-misc/asciinema/asciinema-2.0.1.ebuild32
-rw-r--r--app-misc/asciinema/metadata.xml11
-rw-r--r--app-misc/astrolog-5.40-r313
-rw-r--r--app-misc/astrolog-ephemeris-5.4011
-rw-r--r--app-misc/astrolog-ephemeris/Manifest3
-rw-r--r--app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild25
-rw-r--r--app-misc/astrolog-ephemeris/metadata.xml8
-rw-r--r--app-misc/astrolog/Manifest3
-rw-r--r--app-misc/astrolog/astrolog-5.40-r3.ebuild70
-rw-r--r--app-misc/astrolog/metadata.xml5
-rw-r--r--app-misc/away-0.9.5-r212
-rw-r--r--app-misc/away/Manifest3
-rw-r--r--app-misc/away/away-0.9.5-r2.ebuild39
-rw-r--r--app-misc/away/metadata.xml5
-rw-r--r--app-misc/banner-1.3.311
-rw-r--r--app-misc/banner/Manifest4
-rw-r--r--app-misc/banner/banner-1.3.3.ebuild19
-rw-r--r--app-misc/banner/files/banner-1.3.3-ctype.h.patch11
-rw-r--r--app-misc/banner/metadata.xml8
-rw-r--r--app-misc/bb-1.3.0_rc1-r313
-rw-r--r--app-misc/bb-1.3.0_rc1-r413
-rw-r--r--app-misc/bb/Manifest12
-rw-r--r--app-misc/bb/bb-1.3.0_rc1-r3.ebuild63
-rw-r--r--app-misc/bb/bb-1.3.0_rc1-r4.ebuild66
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch23
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch15
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch396
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch25
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-noattr.patch15
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch55
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-protos.patch16
-rw-r--r--app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch35
-rw-r--r--app-misc/bb/metadata.xml11
-rw-r--r--app-misc/beancounter-0.8.10-r113
-rw-r--r--app-misc/beancounter/Manifest3
-rw-r--r--app-misc/beancounter/beancounter-0.8.10-r1.ebuild32
-rw-r--r--app-misc/beancounter/metadata.xml9
-rw-r--r--app-misc/beanstalkd-1.1011
-rw-r--r--app-misc/beanstalkd/Manifest7
-rw-r--r--app-misc/beanstalkd/beanstalkd-1.10.ebuild50
-rw-r--r--app-misc/beanstalkd/files/conf14
-rw-r--r--app-misc/beanstalkd/files/conf-1.920
-rw-r--r--app-misc/beanstalkd/files/init24
-rw-r--r--app-misc/beanstalkd/files/init-1.925
-rw-r--r--app-misc/beanstalkd/metadata.xml14
-rw-r--r--app-misc/beep-1.3-r311
-rw-r--r--app-misc/beep/Manifest5
-rw-r--r--app-misc/beep/beep-1.3-r3.ebuild37
-rw-r--r--app-misc/beep/files/beep-1.3-CVE-2018-0492.patch106
-rw-r--r--app-misc/beep/files/beep-1.3-Makefile.patch26
-rw-r--r--app-misc/beep/metadata.xml8
-rw-r--r--app-misc/bfm-1.2-r213
-rw-r--r--app-misc/bfm/Manifest5
-rw-r--r--app-misc/bfm/bfm-1.2-r2.ebuild64
-rw-r--r--app-misc/bfm/files/1.2-r2-build.xml75
-rw-r--r--app-misc/bfm/files/1.2-r2-package.patch313
-rw-r--r--app-misc/bfm/metadata.xml16
-rw-r--r--app-misc/bfr-1.6-r211
-rw-r--r--app-misc/bfr-1.6-r311
-rw-r--r--app-misc/bfr/Manifest5
-rw-r--r--app-misc/bfr/bfr-1.6-r2.ebuild21
-rw-r--r--app-misc/bfr/bfr-1.6-r3.ebuild23
-rw-r--r--app-misc/bfr/files/bfr-1.6-perl.patch28
-rw-r--r--app-misc/bfr/metadata.xml8
-rw-r--r--app-misc/bgrep-0_p2011012112
-rw-r--r--app-misc/bgrep/Manifest3
-rw-r--r--app-misc/bgrep/bgrep-0_p20110121.ebuild45
-rw-r--r--app-misc/bgrep/metadata.xml7
-rw-r--r--app-misc/bijiben-3.24.212
-rw-r--r--app-misc/bijiben/Manifest3
-rw-r--r--app-misc/bijiben/bijiben-3.24.2.ebuild33
-rw-r--r--app-misc/bijiben/metadata.xml8
-rw-r--r--app-misc/binclock-1.511
-rw-r--r--app-misc/binclock/Manifest4
-rw-r--r--app-misc/binclock/binclock-1.5.ebuild31
-rw-r--r--app-misc/binclock/files/binclock-1.5-Makefile.patch22
-rw-r--r--app-misc/binclock/metadata.xml9
-rw-r--r--app-misc/binwalk-2.1.114
-rw-r--r--app-misc/binwalk-999912
-rw-r--r--app-misc/binwalk/Manifest5
-rw-r--r--app-misc/binwalk/binwalk-2.1.1.ebuild41
-rw-r--r--app-misc/binwalk/binwalk-9999.ebuild39
-rw-r--r--app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch67
-rw-r--r--app-misc/binwalk/metadata.xml25
-rw-r--r--app-misc/birthday-1.6.2-r110
-rw-r--r--app-misc/birthday/Manifest3
-rw-r--r--app-misc/birthday/birthday-1.6.2-r1.ebuild30
-rw-r--r--app-misc/birthday/metadata.xml11
-rw-r--r--app-misc/blink1-1.9813
-rw-r--r--app-misc/blink1/Manifest3
-rw-r--r--app-misc/blink1/blink1-1.98.ebuild99
-rw-r--r--app-misc/blink1/metadata.xml14
-rw-r--r--app-misc/bottlerocket-0.04c-r110
-rw-r--r--app-misc/bottlerocket/Manifest3
-rw-r--r--app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild44
-rw-r--r--app-misc/bottlerocket/metadata.xml5
-rw-r--r--app-misc/boxes-1.1.2-r111
-rw-r--r--app-misc/boxes-1.1.2-r211
-rw-r--r--app-misc/boxes-1.1.2-r311
-rw-r--r--app-misc/boxes/Manifest5
-rw-r--r--app-misc/boxes/boxes-1.1.2-r1.ebuild40
-rw-r--r--app-misc/boxes/boxes-1.1.2-r2.ebuild40
-rw-r--r--app-misc/boxes/boxes-1.1.2-r3.ebuild39
-rw-r--r--app-misc/boxes/metadata.xml11
-rw-r--r--app-misc/brewtarget-2.3.112
-rw-r--r--app-misc/brewtarget/Manifest3
-rw-r--r--app-misc/brewtarget/brewtarget-2.3.1.ebuild56
-rw-r--r--app-misc/brewtarget/metadata.xml11
-rw-r--r--app-misc/btail-0.312
-rw-r--r--app-misc/btail/Manifest3
-rw-r--r--app-misc/btail/btail-0.3.ebuild41
-rw-r--r--app-misc/btail/metadata.xml5
-rw-r--r--app-misc/byobu-5.12313
-rw-r--r--app-misc/byobu-5.12413
-rw-r--r--app-misc/byobu-5.12513
-rw-r--r--app-misc/byobu/Manifest7
-rw-r--r--app-misc/byobu/byobu-5.123.ebuild43
-rw-r--r--app-misc/byobu/byobu-5.124.ebuild43
-rw-r--r--app-misc/byobu/byobu-5.125.ebuild43
-rw-r--r--app-misc/byobu/metadata.xml23
-rw-r--r--app-misc/c_rehash-1.0.2g_p811
-rw-r--r--app-misc/c_rehash-1.7-r111
-rw-r--r--app-misc/c_rehash/Manifest5
-rw-r--r--app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild34
-rw-r--r--app-misc/c_rehash/c_rehash-1.7-r1.ebuild31
-rw-r--r--app-misc/c_rehash/metadata.xml11
-rw-r--r--app-misc/ca-certificates-20170717.3.36.113
-rw-r--r--app-misc/ca-certificates-20180409.3.36.1-r113
-rw-r--r--app-misc/ca-certificates-20180409.3.3713
-rw-r--r--app-misc/ca-certificates/Manifest10
-rw-r--r--app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild190
-rw-r--r--app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild179
-rw-r--r--app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild179
-rw-r--r--app-misc/ca-certificates/files/ca-certificates-20150426-root.patch49
-rw-r--r--app-misc/ca-certificates/metadata.xml17
-rw-r--r--app-misc/cadubi-1.310
-rw-r--r--app-misc/cadubi/Manifest4
-rw-r--r--app-misc/cadubi/cadubi-1.3.ebuild28
-rw-r--r--app-misc/cadubi/files/cadubi-1.3-helpfile.patch11
-rw-r--r--app-misc/cadubi/metadata.xml5
-rw-r--r--app-misc/calendar-0.9.1-r110
-rw-r--r--app-misc/calendar/Manifest3
-rw-r--r--app-misc/calendar/calendar-0.9.1-r1.ebuild33
-rw-r--r--app-misc/calendar/metadata.xml11
-rw-r--r--app-misc/carbon-c-relay-3.1-r110
-rw-r--r--app-misc/carbon-c-relay-3.213
-rw-r--r--app-misc/carbon-c-relay-3.314
-rw-r--r--app-misc/carbon-c-relay/Manifest11
-rw-r--r--app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild33
-rw-r--r--app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild39
-rw-r--r--app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild56
-rw-r--r--app-misc/carbon-c-relay/files/carbon-c-relay.confd15
-rw-r--r--app-misc/carbon-c-relay/files/carbon-c-relay.confd-r115
-rw-r--r--app-misc/carbon-c-relay/files/carbon-c-relay.initd70
-rw-r--r--app-misc/carbon-c-relay/files/carbon-c-relay.initd-r174
-rw-r--r--app-misc/carbon-c-relay/metadata.xml15
-rw-r--r--app-misc/cbrpager-0.9.2212
-rw-r--r--app-misc/cbrpager/Manifest3
-rw-r--r--app-misc/cbrpager/cbrpager-0.9.22.ebuild28
-rw-r--r--app-misc/cbrpager/metadata.xml11
-rw-r--r--app-misc/cbview-0.06-r110
-rw-r--r--app-misc/cbview/Manifest3
-rw-r--r--app-misc/cbview/cbview-0.06-r1.ebuild25
-rw-r--r--app-misc/cbview/metadata.xml5
-rw-r--r--app-misc/cdargs-1.35-r213
-rw-r--r--app-misc/cdargs/Manifest6
-rw-r--r--app-misc/cdargs/cdargs-1.35-r2.ebuild70
-rw-r--r--app-misc/cdargs/files/50cdargs-gentoo.el8
-rw-r--r--app-misc/cdargs/files/cdargs-1.35-format_security.patch100
-rw-r--r--app-misc/cdargs/files/cdargs-1.35-tinfo.patch20
-rw-r--r--app-misc/cdargs/metadata.xml8
-rw-r--r--app-misc/cdcat-0.311
-rw-r--r--app-misc/cdcat/Manifest3
-rw-r--r--app-misc/cdcat/cdcat-0.3.ebuild49
-rw-r--r--app-misc/cdcat/metadata.xml5
-rw-r--r--app-misc/cdctl-0.1510
-rw-r--r--app-misc/cdctl-0.1611
-rw-r--r--app-misc/cdctl/Manifest8
-rw-r--r--app-misc/cdctl/cdctl-0.15.ebuild36
-rw-r--r--app-misc/cdctl/cdctl-0.16.ebuild29
-rw-r--r--app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch56
-rw-r--r--app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch13
-rw-r--r--app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch55
-rw-r--r--app-misc/cdctl/metadata.xml8
-rw-r--r--app-misc/cdircmp-0.3-r112
-rw-r--r--app-misc/cdircmp-0.3-r211
-rw-r--r--app-misc/cdircmp/Manifest4
-rw-r--r--app-misc/cdircmp/cdircmp-0.3-r1.ebuild38
-rw-r--r--app-misc/cdircmp/cdircmp-0.3-r2.ebuild35
-rw-r--r--app-misc/cdircmp/metadata.xml5
-rw-r--r--app-misc/cdspeed-0.4-r111
-rw-r--r--app-misc/cdspeed/Manifest3
-rw-r--r--app-misc/cdspeed/cdspeed-0.4-r1.ebuild34
-rw-r--r--app-misc/cdspeed/metadata.xml5
-rw-r--r--app-misc/chkcrontab-1.614
-rw-r--r--app-misc/chkcrontab-1.714
-rw-r--r--app-misc/chkcrontab/Manifest5
-rw-r--r--app-misc/chkcrontab/chkcrontab-1.6.ebuild26
-rw-r--r--app-misc/chkcrontab/chkcrontab-1.7.ebuild26
-rw-r--r--app-misc/chkcrontab/metadata.xml15
-rw-r--r--app-misc/ckb-0.2.6-r112
-rw-r--r--app-misc/ckb-0.2.912
-rw-r--r--app-misc/ckb/Manifest6
-rw-r--r--app-misc/ckb/ckb-0.2.6-r1.ebuild45
-rw-r--r--app-misc/ckb/ckb-0.2.9.ebuild46
-rw-r--r--app-misc/ckb/files/ckb.initd29
-rw-r--r--app-misc/ckb/metadata.xml11
-rw-r--r--app-misc/ckermit-8.0.211-r413
-rw-r--r--app-misc/ckermit/Manifest5
-rw-r--r--app-misc/ckermit/ckermit-8.0.211-r4.ebuild76
-rw-r--r--app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch23
-rw-r--r--app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch78
-rw-r--r--app-misc/ckermit/metadata.xml8
-rw-r--r--app-misc/clockywock-0.3.1a12
-rw-r--r--app-misc/clockywock/Manifest4
-rw-r--r--app-misc/clockywock/clockywock-0.3.1a.ebuild32
-rw-r--r--app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch10
-rw-r--r--app-misc/clockywock/metadata.xml8
-rw-r--r--app-misc/cmatrix-1.2a-r313
-rw-r--r--app-misc/cmatrix/Manifest6
-rw-r--r--app-misc/cmatrix/cmatrix-1.2a-r3.ebuild50
-rw-r--r--app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch28
-rw-r--r--app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch48
-rw-r--r--app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch33
-rw-r--r--app-misc/cmatrix/metadata.xml7
-rw-r--r--app-misc/color-1.2-r210
-rw-r--r--app-misc/color/Manifest4
-rw-r--r--app-misc/color/color-1.2-r2.ebuild39
-rw-r--r--app-misc/color/files/1.2-ldflags.patch23
-rw-r--r--app-misc/color/metadata.xml14
-rw-r--r--app-misc/colordiff-1.0.1811
-rw-r--r--app-misc/colordiff/Manifest3
-rw-r--r--app-misc/colordiff/colordiff-1.0.18.ebuild40
-rw-r--r--app-misc/colordiff/metadata.xml8
-rw-r--r--app-misc/conmux-0.15.1-r312
-rw-r--r--app-misc/conmux/Manifest7
-rw-r--r--app-misc/conmux/conmux-0.15.1-r3.ebuild63
-rw-r--r--app-misc/conmux/files/conmux-registry.confd4
-rw-r--r--app-misc/conmux/files/conmux-registry.initd31
-rw-r--r--app-misc/conmux/files/conmux.confd14
-rw-r--r--app-misc/conmux/files/conmux.initd39
-rw-r--r--app-misc/conmux/metadata.xml17
-rw-r--r--app-misc/countrycodes-1.0.5-r310
-rw-r--r--app-misc/countrycodes/Manifest4
-rw-r--r--app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild32
-rw-r--r--app-misc/countrycodes/files/1.0.5-Makefile.patch42
-rw-r--r--app-misc/countrycodes/metadata.xml8
-rw-r--r--app-misc/cpipe-3.0.310
-rw-r--r--app-misc/cpipe/Manifest3
-rw-r--r--app-misc/cpipe/cpipe-3.0.3.ebuild32
-rw-r--r--app-misc/cpipe/metadata.xml11
-rw-r--r--app-misc/crunch-3.610
-rw-r--r--app-misc/crunch/Manifest3
-rw-r--r--app-misc/crunch/crunch-3.6.ebuild29
-rw-r--r--app-misc/crunch/metadata.xml11
-rw-r--r--app-misc/cstream-3.1.111
-rw-r--r--app-misc/cstream/Manifest3
-rw-r--r--app-misc/cstream/cstream-3.1.1.ebuild23
-rw-r--r--app-misc/cstream/metadata.xml18
-rw-r--r--app-misc/cw-1.0.16-r310
-rw-r--r--app-misc/cw/Manifest7
-rw-r--r--app-misc/cw/cw-1.0.16-r3.ebuild62
-rw-r--r--app-misc/cw/files/1.0.16-collision.patch34
-rw-r--r--app-misc/cw/files/1.0.16-format-security.patch16
-rw-r--r--app-misc/cw/files/1.0.16-ldflags.patch18
-rw-r--r--app-misc/cw/files/1.0.16-path.patch19
-rw-r--r--app-misc/cw/metadata.xml11
-rw-r--r--app-misc/dailystrips-1.0.28-r310
-rw-r--r--app-misc/dailystrips/Manifest3
-rw-r--r--app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild30
-rw-r--r--app-misc/dailystrips/metadata.xml8
-rw-r--r--app-misc/datefudge-1.1710
-rw-r--r--app-misc/datefudge/Manifest4
-rw-r--r--app-misc/datefudge/datefudge-1.17.ebuild35
-rw-r--r--app-misc/datefudge/files/datefudge-1.17-bsd.patch58
-rw-r--r--app-misc/datefudge/metadata.xml4
-rw-r--r--app-misc/dateutils-0.4.111
-rw-r--r--app-misc/dateutils-0.4.211
-rw-r--r--app-misc/dateutils-0.4.311
-rw-r--r--app-misc/dateutils/Manifest7
-rw-r--r--app-misc/dateutils/dateutils-0.4.1.ebuild32
-rw-r--r--app-misc/dateutils/dateutils-0.4.2.ebuild31
-rw-r--r--app-misc/dateutils/dateutils-0.4.3.ebuild31
-rw-r--r--app-misc/dateutils/metadata.xml11
-rw-r--r--app-misc/datovka-3.0.3-r114
-rw-r--r--app-misc/datovka-4.10.212
-rw-r--r--app-misc/datovka-4.9.212
-rw-r--r--app-misc/datovka/Manifest7
-rw-r--r--app-misc/datovka/datovka-3.0.3-r1.ebuild27
-rw-r--r--app-misc/datovka/datovka-4.10.2.ebuild54
-rw-r--r--app-misc/datovka/datovka-4.9.2.ebuild46
-rw-r--r--app-misc/datovka/metadata.xml12
-rw-r--r--app-misc/ddate-0.2.112
-rw-r--r--app-misc/ddate/Manifest3
-rw-r--r--app-misc/ddate/ddate-0.2.1.ebuild31
-rw-r--r--app-misc/ddate/metadata.xml7
-rw-r--r--app-misc/ddccontrol-0.4.2_p20140105-r213
-rw-r--r--app-misc/ddccontrol-db-20061014_p2012110513
-rw-r--r--app-misc/ddccontrol-db/Manifest3
-rw-r--r--app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild37
-rw-r--r--app-misc/ddccontrol-db/metadata.xml9
-rw-r--r--app-misc/ddccontrol/Manifest3
-rw-r--r--app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild76
-rw-r--r--app-misc/ddccontrol/metadata.xml12
-rw-r--r--app-misc/ddcutil-0.8.413
-rw-r--r--app-misc/ddcutil-0.8.614
-rw-r--r--app-misc/ddcutil-0.8.6-r114
-rw-r--r--app-misc/ddcutil/Manifest7
-rw-r--r--app-misc/ddcutil/ddcutil-0.8.4.ebuild104
-rw-r--r--app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild108
-rw-r--r--app-misc/ddcutil/ddcutil-0.8.6.ebuild106
-rw-r--r--app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch126
-rw-r--r--app-misc/ddcutil/metadata.xml33
-rw-r--r--app-misc/delay-1.6-r212
-rw-r--r--app-misc/delay/Manifest5
-rw-r--r--app-misc/delay/delay-1.6-r2.ebuild31
-rw-r--r--app-misc/delay/files/delay-1.6-headers.patch10
-rw-r--r--app-misc/delay/files/delay-1.6-tinfo.patch16
-rw-r--r--app-misc/delay/metadata.xml8
-rw-r--r--app-misc/detachtty-9-r110
-rw-r--r--app-misc/detachtty/Manifest3
-rw-r--r--app-misc/detachtty/detachtty-9-r1.ebuild27
-rw-r--r--app-misc/detachtty/metadata.xml18
-rw-r--r--app-misc/detox-1.2.0-r312
-rw-r--r--app-misc/detox/Manifest8
-rw-r--r--app-misc/detox/detox-1.2.0-r3.ebuild46
-rw-r--r--app-misc/detox/files/detox-1.2.0-LDFLAGS.patch18
-rw-r--r--app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch17
-rw-r--r--app-misc/detox/files/detox-1.2.0-format-security.patch72
-rw-r--r--app-misc/detox/files/detox-1.2.0-install-missing-file.patch18
-rw-r--r--app-misc/detox/files/detox-1.2.0-parallel.patch29
-rw-r--r--app-misc/detox/metadata.xml11
-rw-r--r--app-misc/devtodo-0.1.20-r312
-rw-r--r--app-misc/devtodo/Manifest7
-rw-r--r--app-misc/devtodo/devtodo-0.1.20-r3.ebuild70
-rw-r--r--app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch32
-rw-r--r--app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch10
-rw-r--r--app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff85
-rw-r--r--app-misc/devtodo/files/devtodo.bash-completion43
-rw-r--r--app-misc/devtodo/metadata.xml8
-rw-r--r--app-misc/digitemp-3.5.0-r212
-rw-r--r--app-misc/digitemp-3.7.112
-rw-r--r--app-misc/digitemp/Manifest5
-rw-r--r--app-misc/digitemp/digitemp-3.5.0-r2.ebuild75
-rw-r--r--app-misc/digitemp/digitemp-3.7.1.ebuild75
-rw-r--r--app-misc/digitemp/metadata.xml23
-rw-r--r--app-misc/dnetc-2.9107.51612
-rw-r--r--app-misc/dnetc-2.9108.51712
-rw-r--r--app-misc/dnetc-2.9109.51812
-rw-r--r--app-misc/dnetc-2.9110.51912
-rw-r--r--app-misc/dnetc-2.9110.519b12
-rw-r--r--app-misc/dnetc/Manifest15
-rw-r--r--app-misc/dnetc/dnetc-2.9107.516.ebuild93
-rw-r--r--app-misc/dnetc/dnetc-2.9108.517.ebuild93
-rw-r--r--app-misc/dnetc/dnetc-2.9109.518.ebuild93
-rw-r--r--app-misc/dnetc/dnetc-2.9110.519.ebuild93
-rw-r--r--app-misc/dnetc/dnetc-2.9110.519b.ebuild95
-rw-r--r--app-misc/dnetc/files/dnetc.confd18
-rw-r--r--app-misc/dnetc/files/dnetc.initd88
-rw-r--r--app-misc/dnetc/metadata.xml11
-rw-r--r--app-misc/dtach-0.8-r110
-rw-r--r--app-misc/dtach-0.99
-rw-r--r--app-misc/dtach/Manifest6
-rw-r--r--app-misc/dtach/dtach-0.8-r1.ebuild25
-rw-r--r--app-misc/dtach/dtach-0.9.ebuild19
-rw-r--r--app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch35
-rw-r--r--app-misc/dtach/metadata.xml12
-rw-r--r--app-misc/dvorak7min-1.6.110
-rw-r--r--app-misc/dvorak7min/Manifest3
-rw-r--r--app-misc/dvorak7min/dvorak7min-1.6.1.ebuild31
-rw-r--r--app-misc/dvorak7min/metadata.xml5
-rw-r--r--app-misc/dvorakng-0.6.012
-rw-r--r--app-misc/dvorakng/Manifest3
-rw-r--r--app-misc/dvorakng/dvorakng-0.6.0.ebuild35
-rw-r--r--app-misc/dvorakng/metadata.xml8
-rw-r--r--app-misc/dvtm-0.14-r113
-rw-r--r--app-misc/dvtm-0.15-r213
-rw-r--r--app-misc/dvtm-0.15-r313
-rw-r--r--app-misc/dvtm-999911
-rw-r--r--app-misc/dvtm/Manifest10
-rw-r--r--app-misc/dvtm/dvtm-0.14-r1.ebuild68
-rw-r--r--app-misc/dvtm/dvtm-0.15-r2.ebuild62
-rw-r--r--app-misc/dvtm/dvtm-0.15-r3.ebuild60
-rw-r--r--app-misc/dvtm/dvtm-9999.ebuild60
-rw-r--r--app-misc/dvtm/files/dvtm-0.15-gentoo.patch36
-rw-r--r--app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch12
-rw-r--r--app-misc/dvtm/files/dvtm-9999-gentoo.patch13
-rw-r--r--app-misc/dvtm/metadata.xml8
-rw-r--r--app-misc/editor-wrapper-48
-rw-r--r--app-misc/editor-wrapper/Manifest3
-rw-r--r--app-misc/editor-wrapper/editor-wrapper-4.ebuild31
-rw-r--r--app-misc/editor-wrapper/files/editor-wrapper-4.sh17
-rw-r--r--app-misc/editor-wrapper/metadata.xml12
-rw-r--r--app-misc/egads-0.9.510
-rw-r--r--app-misc/egads-0.9.5-r110
-rw-r--r--app-misc/egads/Manifest4
-rw-r--r--app-misc/egads/egads-0.9.5-r1.ebuild48
-rw-r--r--app-misc/egads/egads-0.9.5.ebuild51
-rw-r--r--app-misc/egads/metadata.xml8
-rw-r--r--app-misc/elasticsearch-5.6.1012
-rw-r--r--app-misc/elasticsearch-6.2.412
-rw-r--r--app-misc/elasticsearch-6.3.112
-rw-r--r--app-misc/elasticsearch/Manifest17
-rw-r--r--app-misc/elasticsearch/elasticsearch-5.6.10.ebuild69
-rw-r--r--app-misc/elasticsearch/elasticsearch-6.2.4.ebuild72
-rw-r--r--app-misc/elasticsearch/elasticsearch-6.3.1.ebuild72
-rwxr-xr-xapp-misc/elasticsearch/files/elasticsearch-systemd-pre-exec7
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.conf.259
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.conf.362
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.init.260
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.init.362
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.init.467
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.service53
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.service.251
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.sysctl.d1
-rw-r--r--app-misc/elasticsearch/files/elasticsearch.tmpfiles.d1
-rw-r--r--app-misc/elasticsearch/metadata.xml16
-rw-r--r--app-misc/email2trac-2.6.2-r113
-rw-r--r--app-misc/email2trac-2.8.413
-rw-r--r--app-misc/email2trac-2.8.813
-rw-r--r--app-misc/email2trac/Manifest7
-rw-r--r--app-misc/email2trac/email2trac-2.6.2-r1.ebuild39
-rw-r--r--app-misc/email2trac/email2trac-2.8.4.ebuild39
-rw-r--r--app-misc/email2trac/email2trac-2.8.8.ebuild39
-rw-r--r--app-misc/email2trac/metadata.xml8
-rw-r--r--app-misc/emelfm2-0.9.1-r114
-rw-r--r--app-misc/emelfm2-0.9.1-r214
-rw-r--r--app-misc/emelfm2/Manifest4
-rw-r--r--app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild86
-rw-r--r--app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild86
-rw-r--r--app-misc/emelfm2/metadata.xml12
-rw-r--r--app-misc/empty-0.6.20b11
-rw-r--r--app-misc/empty/Manifest4
-rw-r--r--app-misc/empty/empty-0.6.20b.ebuild33
-rw-r--r--app-misc/empty/files/empty-respect-LDFLAGS.patch11
-rw-r--r--app-misc/empty/metadata.xml11
-rw-r--r--app-misc/enum-1.1-r19
-rw-r--r--app-misc/enum/Manifest3
-rw-r--r--app-misc/enum/enum-1.1-r1.ebuild34
-rw-r--r--app-misc/enum/metadata.xml11
-rw-r--r--app-misc/esekeyd-1.2.79
-rw-r--r--app-misc/esekeyd/Manifest3
-rw-r--r--app-misc/esekeyd/esekeyd-1.2.7.ebuild14
-rw-r--r--app-misc/esekeyd/metadata.xml8
-rw-r--r--app-misc/evemu-2.6.014
-rw-r--r--app-misc/evemu-2.7.014
-rw-r--r--app-misc/evemu/Manifest5
-rw-r--r--app-misc/evemu/evemu-2.6.0.ebuild43
-rw-r--r--app-misc/evemu/evemu-2.7.0.ebuild43
-rw-r--r--app-misc/evemu/metadata.xml8
-rw-r--r--app-misc/evtest-1.3013
-rw-r--r--app-misc/evtest-1.3111
-rw-r--r--app-misc/evtest/Manifest9
-rw-r--r--app-misc/evtest/evtest-1.30.ebuild39
-rw-r--r--app-misc/evtest/evtest-1.31.ebuild37
-rw-r--r--app-misc/evtest/files/evtest-1.30-autoconf.patch33
-rw-r--r--app-misc/evtest/files/evtest-1.30-xml.patch40
-rw-r--r--app-misc/evtest/metadata.xml5
-rw-r--r--app-misc/faq-0.0.112
-rw-r--r--app-misc/faq/Manifest18
-rw-r--r--app-misc/faq/faq-0.0.1.ebuild51
-rw-r--r--app-misc/faq/metadata.xml11
-rw-r--r--app-misc/fdupes-1.5.110
-rw-r--r--app-misc/fdupes-1.6.110
-rw-r--r--app-misc/fdupes-1.6.1-r110
-rw-r--r--app-misc/fdupes-99999
-rw-r--r--app-misc/fdupes/Manifest12
-rw-r--r--app-misc/fdupes/fdupes-1.5.1.ebuild40
-rw-r--r--app-misc/fdupes/fdupes-1.6.1-r1.ebuild29
-rw-r--r--app-misc/fdupes/fdupes-1.6.1.ebuild29
-rw-r--r--app-misc/fdupes/fdupes-9999.ebuild34
-rw-r--r--app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch58
-rw-r--r--app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch12
-rw-r--r--app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch20
-rw-r--r--app-misc/fdupes/files/fdupes-1.51-makefile.patch23
-rw-r--r--app-misc/fdupes/files/fdupes-9999-gentoo.patch14
-rw-r--r--app-misc/fdupes/metadata.xml11
-rw-r--r--app-misc/fdutils-5.5.2006022713
-rw-r--r--app-misc/fdutils/Manifest4
-rw-r--r--app-misc/fdutils/fdutils-5.5.20060227.ebuild55
-rw-r--r--app-misc/fdutils/metadata.xml5
-rw-r--r--app-misc/fhem-5.813
-rw-r--r--app-misc/fhem/Manifest5
-rw-r--r--app-misc/fhem/fhem-5.8.ebuild99
-rw-r--r--app-misc/fhem/files/fhem.cfg27
-rw-r--r--app-misc/fhem/files/fhem.initd17
-rw-r--r--app-misc/fhem/metadata.xml20
-rw-r--r--app-misc/figlet-2.2.510
-rw-r--r--app-misc/figlet-2.2.5-r110
-rw-r--r--app-misc/figlet/Manifest6
-rw-r--r--app-misc/figlet/figlet-2.2.5-r1.ebuild38
-rw-r--r--app-misc/figlet/figlet-2.2.5.ebuild39
-rw-r--r--app-misc/figlet/files/figlet.bashcomp51
-rw-r--r--app-misc/figlet/files/figlet.bashcomp-r151
-rw-r--r--app-misc/figlet/metadata.xml7
-rw-r--r--app-misc/flirc-3.11.614
-rw-r--r--app-misc/flirc/Manifest4
-rw-r--r--app-misc/flirc/flirc-3.11.6.ebuild47
-rw-r--r--app-misc/flirc/metadata.xml12
-rw-r--r--app-misc/freemind-1.0.1-r313
-rw-r--r--app-misc/freemind/Manifest3
-rw-r--r--app-misc/freemind/freemind-1.0.1-r3.ebuild121
-rw-r--r--app-misc/freemind/metadata.xml17
-rw-r--r--app-misc/freeplane-1.5.1813
-rw-r--r--app-misc/freeplane/Manifest4
-rw-r--r--app-misc/freeplane/freeplane-1.5.18.ebuild49
-rw-r--r--app-misc/freeplane/metadata.xml14
-rw-r--r--app-misc/fslint-2.4614
-rw-r--r--app-misc/fslint/Manifest3
-rw-r--r--app-misc/fslint/fslint-2.46.ebuild79
-rw-r--r--app-misc/fslint/metadata.xml8
-rw-r--r--app-misc/fslurp-2.1.410
-rw-r--r--app-misc/fslurp/Manifest4
-rw-r--r--app-misc/fslurp/files/fslurp-2.1.4-makefile.patch47
-rw-r--r--app-misc/fslurp/fslurp-2.1.4.ebuild27
-rw-r--r--app-misc/fslurp/metadata.xml16
-rw-r--r--app-misc/fsniper-1.3.1-r212
-rw-r--r--app-misc/fsniper/Manifest6
-rw-r--r--app-misc/fsniper/files/fsniper-1.3.1-format-security.patch26
-rw-r--r--app-misc/fsniper/files/fsniper-1.3.1-umask.patch18
-rw-r--r--app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch15
-rw-r--r--app-misc/fsniper/fsniper-1.3.1-r2.ebuild38
-rw-r--r--app-misc/fsniper/metadata.xml11
-rw-r--r--app-misc/fujiplay-1.3310
-rw-r--r--app-misc/fujiplay/Manifest4
-rw-r--r--app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch75
-rw-r--r--app-misc/fujiplay/fujiplay-1.33.ebuild51
-rw-r--r--app-misc/fujiplay/metadata.xml5
-rw-r--r--app-misc/g15composer-3.111
-rw-r--r--app-misc/g15composer-3.212
-rw-r--r--app-misc/g15composer/Manifest10
-rw-r--r--app-misc/g15composer/files/g15composer-3.1.confd17
-rw-r--r--app-misc/g15composer/files/g15composer-3.1.initd48
-rw-r--r--app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch44
-rw-r--r--app-misc/g15composer/files/g15composer-3.2.confd17
-rw-r--r--app-misc/g15composer/files/g15composer-3.2.initd48
-rw-r--r--app-misc/g15composer/g15composer-3.1.ebuild38
-rw-r--r--app-misc/g15composer/g15composer-3.2.ebuild53
-rw-r--r--app-misc/g15composer/metadata.xml14
-rw-r--r--app-misc/g15daemon-1.9.5.3-r1314
-rw-r--r--app-misc/g15daemon-1.9.5.3-r2113
-rw-r--r--app-misc/g15daemon-999912
-rw-r--r--app-misc/g15daemon/Manifest14
-rw-r--r--app-misc/g15daemon/files/20g15daemon15
-rw-r--r--app-misc/g15daemon/files/99-g15daemon.rules1
-rw-r--r--app-misc/g15daemon/files/g15daemon-1.2.7.confd9
-rw-r--r--app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch11
-rw-r--r--app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch340
-rw-r--r--app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch11
-rw-r--r--app-misc/g15daemon/files/g15daemon-1.9.5.3.initd45
-rw-r--r--app-misc/g15daemon/files/g15daemon-hotplug15
-rw-r--r--app-misc/g15daemon/files/g15daemon.conf27
-rw-r--r--app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild160
-rw-r--r--app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild162
-rw-r--r--app-misc/g15daemon/g15daemon-9999.ebuild174
-rw-r--r--app-misc/g15daemon/metadata.xml14
-rw-r--r--app-misc/g15macro-1.0.3-r212
-rw-r--r--app-misc/g15macro/Manifest5
-rw-r--r--app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch13
-rw-r--r--app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch10
-rw-r--r--app-misc/g15macro/g15macro-1.0.3-r2.ebuild40
-rw-r--r--app-misc/g15macro/metadata.xml14
-rw-r--r--app-misc/g15message-1.0.0-r111
-rw-r--r--app-misc/g15message/Manifest3
-rw-r--r--app-misc/g15message/g15message-1.0.0-r1.ebuild20
-rw-r--r--app-misc/g15message/metadata.xml14
-rw-r--r--app-misc/g15mpd-1.0.0-r112
-rw-r--r--app-misc/g15mpd/Manifest5
-rw-r--r--app-misc/g15mpd/files/g15mpd-1.0.0-cflags-and-lib-fix.patch18
-rw-r--r--app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch34
-rw-r--r--app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild37
-rw-r--r--app-misc/g15mpd/metadata.xml8
-rw-r--r--app-misc/g15stats-1.9.711
-rw-r--r--app-misc/g15stats/Manifest5
-rw-r--r--app-misc/g15stats/files/g15stats-1.9.7.confd20
-rw-r--r--app-misc/g15stats/files/g15stats-1.9.7.initd23
-rw-r--r--app-misc/g15stats/g15stats-1.9.7.ebuild48
-rw-r--r--app-misc/g15stats/metadata.xml14
-rw-r--r--app-misc/gcal-3.6.313
-rw-r--r--app-misc/gcal-4.113
-rw-r--r--app-misc/gcal/Manifest5
-rw-r--r--app-misc/gcal/gcal-3.6.3.ebuild32
-rw-r--r--app-misc/gcal/gcal-4.1.ebuild36
-rw-r--r--app-misc/gcal/metadata.xml20
-rw-r--r--app-misc/gcalcli-3.214
-rw-r--r--app-misc/gcalcli-3.3.214
-rw-r--r--app-misc/gcalcli-3.4.013
-rw-r--r--app-misc/gcalcli-4.0.0_alpha314
-rw-r--r--app-misc/gcalcli-4.0.0_alpha3-r114
-rw-r--r--app-misc/gcalcli/Manifest11
-rw-r--r--app-misc/gcalcli/files/gcalcli-oauth2client.patch30
-rw-r--r--app-misc/gcalcli/gcalcli-3.2.ebuild30
-rw-r--r--app-misc/gcalcli/gcalcli-3.3.2.ebuild30
-rw-r--r--app-misc/gcalcli/gcalcli-3.4.0.ebuild35
-rw-r--r--app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild37
-rw-r--r--app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild34
-rw-r--r--app-misc/gcalcli/metadata.xml11
-rw-r--r--app-misc/gcstar-1.7.013
-rw-r--r--app-misc/gcstar-1.7.113
-rw-r--r--app-misc/gcstar/Manifest7
-rw-r--r--app-misc/gcstar/files/gcstar-1.4.0-man.patch26
-rw-r--r--app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch23
-rw-r--r--app-misc/gcstar/gcstar-1.7.0.ebuild115
-rw-r--r--app-misc/gcstar/gcstar-1.7.1.ebuild87
-rw-r--r--app-misc/gcstar/metadata.xml22
-rw-r--r--app-misc/geekcode-1.7.3-r110
-rw-r--r--app-misc/geekcode/Manifest4
-rw-r--r--app-misc/geekcode/files/geekcode-1.7.3-exit.patch10
-rw-r--r--app-misc/geekcode/geekcode-1.7.3-r1.ebuild30
-rw-r--r--app-misc/geekcode/metadata.xml11
-rw-r--r--app-misc/geneweb-6.08-r114
-rw-r--r--app-misc/geneweb/Manifest8
-rw-r--r--app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch31
-rw-r--r--app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch30
-rw-r--r--app-misc/geneweb/files/geneweb.confd6
-rw-r--r--app-misc/geneweb/files/geneweb.initd19
-rw-r--r--app-misc/geneweb/geneweb-6.08-r1.ebuild77
-rw-r--r--app-misc/geneweb/metadata.xml17
-rw-r--r--app-misc/gentoo-0.20.713
-rw-r--r--app-misc/gentoo/Manifest3
-rw-r--r--app-misc/gentoo/gentoo-0.20.7.ebuild67
-rw-r--r--app-misc/gentoo/metadata.xml11
-rw-r--r--app-misc/geoclue-0.12.9914
-rw-r--r--app-misc/geoclue-2.4.813
-rw-r--r--app-misc/geoclue/Manifest9
-rw-r--r--app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch16
-rw-r--r--app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch79
-rw-r--r--app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch73
-rw-r--r--app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch44
-rw-r--r--app-misc/geoclue/geoclue-0.12.99.ebuild71
-rw-r--r--app-misc/geoclue/geoclue-2.4.8.ebuild59
-rw-r--r--app-misc/geoclue/metadata.xml21
-rw-r--r--app-misc/getopt-1.1.613
-rw-r--r--app-misc/getopt/Manifest7
-rw-r--r--app-misc/getopt/files/getopt-1.1.4-irix.patch17
-rw-r--r--app-misc/getopt/files/getopt-1.1.5-libintl.patch11
-rw-r--r--app-misc/getopt/files/getopt-1.1.5-setlocale.patch12
-rw-r--r--app-misc/getopt/files/getopt-1.1.6-longrename.patch70
-rw-r--r--app-misc/getopt/getopt-1.1.6.ebuild64
-rw-r--r--app-misc/getopt/metadata.xml12
-rw-r--r--app-misc/glastree-1.0411
-rw-r--r--app-misc/glastree/Manifest4
-rw-r--r--app-misc/glastree/files/glastree-posix-make.patch16
-rw-r--r--app-misc/glastree/glastree-1.04.ebuild28
-rw-r--r--app-misc/glastree/metadata.xml5
-rw-r--r--app-misc/glcdprocdriver-0.0.612
-rw-r--r--app-misc/glcdprocdriver/Manifest3
-rw-r--r--app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild29
-rw-r--r--app-misc/glcdprocdriver/metadata.xml12
-rw-r--r--app-misc/glimpse-4.18.6-r112
-rw-r--r--app-misc/glimpse/Manifest4
-rw-r--r--app-misc/glimpse/files/glimpse-4.18.6-makefile.patch42
-rw-r--r--app-misc/glimpse/glimpse-4.18.6-r1.ebuild60
-rw-r--r--app-misc/glimpse/metadata.xml5
-rw-r--r--app-misc/gnote-3.24.113
-rw-r--r--app-misc/gnote/Manifest3
-rw-r--r--app-misc/gnote/gnote-3.24.1.ebuild71
-rw-r--r--app-misc/gnote/metadata.xml11
-rw-r--r--app-misc/gnuit-4.9.5-r210
-rw-r--r--app-misc/gnuit/Manifest4
-rw-r--r--app-misc/gnuit/files/gnuit-4.9.5-format-security.patch16
-rw-r--r--app-misc/gnuit/gnuit-4.9.5-r2.ebuild38
-rw-r--r--app-misc/gnuit/metadata.xml8
-rw-r--r--app-misc/gnutu-2.5-r111
-rw-r--r--app-misc/gnutu/Manifest3
-rw-r--r--app-misc/gnutu/gnutu-2.5-r1.ebuild20
-rw-r--r--app-misc/gnutu/metadata.xml16
-rw-r--r--app-misc/go-jira-1.0.1711
-rw-r--r--app-misc/go-jira/Manifest3
-rw-r--r--app-misc/go-jira/go-jira-1.0.17.ebuild29
-rw-r--r--app-misc/go-jira/metadata.xml11
-rw-r--r--app-misc/golly-2.7-r114
-rw-r--r--app-misc/golly-2.814
-rw-r--r--app-misc/golly/Manifest5
-rw-r--r--app-misc/golly/golly-2.7-r1.ebuild50
-rw-r--r--app-misc/golly/golly-2.8.ebuild58
-rw-r--r--app-misc/golly/metadata.xml11
-rw-r--r--app-misc/goobook-1.914
-rw-r--r--app-misc/goobook/Manifest3
-rw-r--r--app-misc/goobook/goobook-1.9.ebuild48
-rw-r--r--app-misc/goobook/metadata.xml8
-rw-r--r--app-misc/gourmet-0.17.4-r214
-rw-r--r--app-misc/gourmet/Manifest6
-rw-r--r--app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch56
-rw-r--r--app-misc/gourmet/files/no-docs-0.17.0.patch10
-rw-r--r--app-misc/gourmet/files/tostring-to-tobytes.patch26
-rw-r--r--app-misc/gourmet/gourmet-0.17.4-r2.ebuild62
-rw-r--r--app-misc/gourmet/metadata.xml48
-rw-r--r--app-misc/grabcartoons-2.8.4_p2014111212
-rw-r--r--app-misc/grabcartoons-999911
-rw-r--r--app-misc/grabcartoons/Manifest5
-rw-r--r--app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch32
-rw-r--r--app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild33
-rw-r--r--app-misc/grabcartoons/grabcartoons-9999.ebuild33
-rw-r--r--app-misc/grabcartoons/metadata.xml8
-rw-r--r--app-misc/gramps-4.2.514
-rw-r--r--app-misc/gramps-4.2.814
-rw-r--r--app-misc/gramps/Manifest6
-rw-r--r--app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch33
-rw-r--r--app-misc/gramps/gramps-4.2.5.ebuild45
-rw-r--r--app-misc/gramps/gramps-4.2.8.ebuild57
-rw-r--r--app-misc/gramps/metadata.xml103
-rw-r--r--app-misc/graphlcd-base-0.1.913
-rw-r--r--app-misc/graphlcd-base/Manifest5
-rw-r--r--app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch75
-rw-r--r--app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch30
-rw-r--r--app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild50
-rw-r--r--app-misc/graphlcd-base/metadata.xml15
-rw-r--r--app-misc/grc-1.11-r114
-rw-r--r--app-misc/grc-1.514
-rw-r--r--app-misc/grc-1.914
-rw-r--r--app-misc/grc/Manifest14
-rw-r--r--app-misc/grc/files/conf.configure27
-rw-r--r--app-misc/grc/files/grc-1.4-ipv6.patch16
-rw-r--r--app-misc/grc/files/grc-1.4-support-more-files.patch53
-rw-r--r--app-misc/grc/files/grc-1.9-bash.patch26
-rw-r--r--app-misc/grc/files/grc-1.9-configure.patch46
-rw-r--r--app-misc/grc/files/grc-1.9-domain-match.patch22
-rw-r--r--app-misc/grc/files/grc-1.9-python3.patch41
-rw-r--r--app-misc/grc/grc-1.11-r1.ebuild61
-rw-r--r--app-misc/grc/grc-1.5.ebuild41
-rw-r--r--app-misc/grc/grc-1.9.ebuild53
-rw-r--r--app-misc/grc/metadata.xml11
-rw-r--r--app-misc/gtk-sunlight-0.4.212
-rw-r--r--app-misc/gtk-sunlight/Manifest3
-rw-r--r--app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild26
-rw-r--r--app-misc/gtk-sunlight/metadata.xml8
-rw-r--r--app-misc/gtypist-2.9.513
-rw-r--r--app-misc/gtypist/Manifest6
-rw-r--r--app-misc/gtypist/files/50gtypist-gentoo.el6
-rw-r--r--app-misc/gtypist/files/gtypist-2.8.3-xemacs-compat.patch18
-rw-r--r--app-misc/gtypist/gtypist-2.9.5.ebuild69
-rw-r--r--app-misc/gtypist/metadata.xml8
-rw-r--r--app-misc/hachoir-metadata-1.3.3-r114
-rw-r--r--app-misc/hachoir-metadata/Manifest3
-rw-r--r--app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild58
-rw-r--r--app-misc/hachoir-metadata/metadata.xml11
-rw-r--r--app-misc/hachoir-subfile-0.5.3-r114
-rw-r--r--app-misc/hachoir-subfile/Manifest3
-rw-r--r--app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild29
-rw-r--r--app-misc/hachoir-subfile/metadata.xml10
-rw-r--r--app-misc/hachoir-urwid-1.1-r114
-rw-r--r--app-misc/hachoir-urwid/Manifest3
-rw-r--r--app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild30
-rw-r--r--app-misc/hachoir-urwid/metadata.xml10
-rw-r--r--app-misc/hatools-2.1410
-rw-r--r--app-misc/hatools/Manifest3
-rw-r--r--app-misc/hatools/hatools-2.14.ebuild17
-rw-r--r--app-misc/hatools/metadata.xml8
-rw-r--r--app-misc/hddled-0.313
-rw-r--r--app-misc/hddled/Manifest3
-rw-r--r--app-misc/hddled/hddled-0.3.ebuild40
-rw-r--r--app-misc/hddled/metadata.xml8
-rw-r--r--app-misc/hello-2.1010
-rw-r--r--app-misc/hello/Manifest3
-rw-r--r--app-misc/hello/hello-2.10.ebuild19
-rw-r--r--app-misc/hello/metadata.xml8
-rw-r--r--app-misc/hexcompare-1.0.412
-rw-r--r--app-misc/hexcompare/Manifest4
-rw-r--r--app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch14
-rw-r--r--app-misc/hexcompare/hexcompare-1.0.4.ebuild28
-rw-r--r--app-misc/hexcompare/metadata.xml11
-rw-r--r--app-misc/hilite-1.5-r110
-rw-r--r--app-misc/hilite/Manifest3
-rw-r--r--app-misc/hilite/hilite-1.5-r1.ebuild33
-rw-r--r--app-misc/hilite/metadata.xml11
-rw-r--r--app-misc/hivex-1.3.1414
-rw-r--r--app-misc/hivex/Manifest3
-rw-r--r--app-misc/hivex/hivex-1.3.14.ebuild102
-rw-r--r--app-misc/hivex/metadata.xml8
-rw-r--r--app-misc/i2bits-0.0.211
-rw-r--r--app-misc/i2bits-0.1.011
-rw-r--r--app-misc/i2bits/Manifest5
-rw-r--r--app-misc/i2bits/i2bits-0.0.2.ebuild26
-rw-r--r--app-misc/i2bits/i2bits-0.1.0.ebuild14
-rw-r--r--app-misc/i2bits/metadata.xml11
-rw-r--r--app-misc/icdiff-1.7.314
-rw-r--r--app-misc/icdiff-1.9.114
-rw-r--r--app-misc/icdiff/Manifest6
-rw-r--r--app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch16
-rw-r--r--app-misc/icdiff/icdiff-1.7.3.ebuild27
-rw-r--r--app-misc/icdiff/icdiff-1.9.1.ebuild23
-rw-r--r--app-misc/icdiff/metadata.xml11
-rw-r--r--app-misc/ifp-line-0.311
-rw-r--r--app-misc/ifp-line/Manifest4
-rw-r--r--app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch30
-rw-r--r--app-misc/ifp-line/ifp-line-0.3.ebuild39
-rw-r--r--app-misc/ifp-line/metadata.xml11
-rw-r--r--app-misc/ignuit-2.24.313
-rw-r--r--app-misc/ignuit/Manifest3
-rw-r--r--app-misc/ignuit/ignuit-2.24.3.ebuild52
-rw-r--r--app-misc/ignuit/metadata.xml5
-rw-r--r--app-misc/iguanaIR-1.0.1-r114
-rw-r--r--app-misc/iguanaIR/Manifest3
-rw-r--r--app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild48
-rw-r--r--app-misc/iguanaIR/metadata.xml8
-rw-r--r--app-misc/inputlircd-0.0.1_pre15-r210
-rw-r--r--app-misc/inputlircd/Manifest7
-rw-r--r--app-misc/inputlircd/files/inputlircd-linux-4.4-fix.patch13
-rw-r--r--app-misc/inputlircd/files/inputlircd.conf2
-rw-r--r--app-misc/inputlircd/files/inputlircd.init13
-rw-r--r--app-misc/inputlircd/files/inputlircd.init.217
-rw-r--r--app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild37
-rw-r--r--app-misc/inputlircd/metadata.xml8
-rw-r--r--app-misc/interceptty-0.6-r19
-rw-r--r--app-misc/interceptty/Manifest3
-rw-r--r--app-misc/interceptty/interceptty-0.6-r1.ebuild22
-rw-r--r--app-misc/interceptty/metadata.xml7
-rw-r--r--app-misc/irtrans-irclient-6.01.0511
-rw-r--r--app-misc/irtrans-irclient/Manifest4
-rw-r--r--app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild66
-rw-r--r--app-misc/irtrans-irclient/metadata.xml16
-rw-r--r--app-misc/irtrans-irserver-6.09.0413
-rw-r--r--app-misc/irtrans-irserver/Manifest6
-rw-r--r--app-misc/irtrans-irserver/files/irtrans-server.confd12
-rw-r--r--app-misc/irtrans-irserver/files/irtrans-server.initd21
-rw-r--r--app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild83
-rw-r--r--app-misc/irtrans-irserver/metadata.xml19
-rw-r--r--app-misc/jail-2.0-r112
-rw-r--r--app-misc/jail-2.0-r211
-rw-r--r--app-misc/jail/Manifest10
-rw-r--r--app-misc/jail/files/jail-1.9-gentoo.patch130
-rw-r--r--app-misc/jail/files/jail-1.9-ldflags.patch11
-rw-r--r--app-misc/jail/files/jail-1.9-multiuser-rsa.patch44
-rw-r--r--app-misc/jail/files/jail-1.9-wrongshell.patch11
-rw-r--r--app-misc/jail/files/jail-2.0-symlinks.patch11
-rw-r--r--app-misc/jail/files/jail-2.0-sysmacros.patch20
-rw-r--r--app-misc/jail/jail-2.0-r1.ebuild70
-rw-r--r--app-misc/jail/jail-2.0-r2.ebuild69
-rw-r--r--app-misc/jail/metadata.xml15
-rw-r--r--app-misc/jira-cli-2.1.515
-rw-r--r--app-misc/jira-cli/Manifest3
-rw-r--r--app-misc/jira-cli/jira-cli-2.1.5.ebuild46
-rw-r--r--app-misc/jira-cli/metadata.xml8
-rw-r--r--app-misc/jitac-0.3.013
-rw-r--r--app-misc/jitac/Manifest3
-rw-r--r--app-misc/jitac/jitac-0.3.0.ebuild43
-rw-r--r--app-misc/jitac/metadata.xml8
-rw-r--r--app-misc/jot-9.0-r111
-rw-r--r--app-misc/jot/Manifest3
-rw-r--r--app-misc/jot/jot-9.0-r1.ebuild23
-rw-r--r--app-misc/jot/metadata.xml11
-rw-r--r--app-misc/joy2key-1.6.3-r112
-rw-r--r--app-misc/joy2key/Manifest3
-rw-r--r--app-misc/joy2key/joy2key-1.6.3-r1.ebuild30
-rw-r--r--app-misc/joy2key/metadata.xml8
-rw-r--r--app-misc/joymouse-0.511
-rw-r--r--app-misc/joymouse/Manifest3
-rw-r--r--app-misc/joymouse/joymouse-0.5.ebuild25
-rw-r--r--app-misc/joymouse/metadata.xml11
-rw-r--r--app-misc/jq-1.5-r313
-rw-r--r--app-misc/jq/Manifest6
-rw-r--r--app-misc/jq/files/jq-1.5-dynamic-link.patch13
-rw-r--r--app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch34
-rw-r--r--app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch58
-rw-r--r--app-misc/jq/jq-1.5-r3.ebuild60
-rw-r--r--app-misc/jq/metadata.xml14
-rw-r--r--app-misc/kanatest-0.4.812
-rw-r--r--app-misc/kanatest/Manifest6
-rw-r--r--app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch23
-rw-r--r--app-misc/kanatest/files/kanatest-0.4.8-autoconf.patch13
-rw-r--r--app-misc/kanatest/files/kanatest-0.4.8-cflags.patch13
-rw-r--r--app-misc/kanatest/kanatest-0.4.8.ebuild40
-rw-r--r--app-misc/kanatest/metadata.xml8
-rw-r--r--app-misc/khal-0.9.714
-rw-r--r--app-misc/khal-0.9.814
-rw-r--r--app-misc/khal-0.9.9-r114
-rw-r--r--app-misc/khal/Manifest7
-rw-r--r--app-misc/khal/khal-0.9.7.ebuild44
-rw-r--r--app-misc/khal/khal-0.9.8.ebuild43
-rw-r--r--app-misc/khal/khal-0.9.9-r1.ebuild43
-rw-r--r--app-misc/khal/metadata.xml10
-rw-r--r--app-misc/khard-0.11.414
-rw-r--r--app-misc/khard-0.12.214
-rw-r--r--app-misc/khard/Manifest5
-rw-r--r--app-misc/khard/khard-0.11.4.ebuild41
-rw-r--r--app-misc/khard/khard-0.12.2.ebuild42
-rw-r--r--app-misc/khard/metadata.xml11
-rw-r--r--app-misc/klavaro-3.0.113
-rw-r--r--app-misc/klavaro/Manifest7
-rw-r--r--app-misc/klavaro/files/klavaro-3.0.1-datadir.patch27
-rw-r--r--app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch11
-rw-r--r--app-misc/klavaro/files/klavaro-3.0.1-static.patch8
-rw-r--r--app-misc/klavaro/files/klavaro-desktop-keywords.patch11
-rw-r--r--app-misc/klavaro/klavaro-3.0.1.ebuild43
-rw-r--r--app-misc/klavaro/metadata.xml8
-rw-r--r--app-misc/kryoflux-dtc-2.614
-rw-r--r--app-misc/kryoflux-dtc/Manifest4
-rw-r--r--app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild104
-rw-r--r--app-misc/kryoflux-dtc/metadata.xml17
-rw-r--r--app-misc/ktoblzcheck-1.4914
-rw-r--r--app-misc/ktoblzcheck/Manifest3
-rw-r--r--app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild45
-rw-r--r--app-misc/ktoblzcheck/metadata.xml10
-rw-r--r--app-misc/lcd4linux-0.10.1_rc2-r414
-rw-r--r--app-misc/lcd4linux-0.11.0_pre2017052714
-rw-r--r--app-misc/lcd4linux/Manifest13
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch20
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch12
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch374
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch187
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch121
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch64
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd22
-rw-r--r--app-misc/lcd4linux/files/lcd4linux-r1.initd29
-rw-r--r--app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild174
-rw-r--r--app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild161
-rw-r--r--app-misc/lcd4linux/metadata.xml56
-rw-r--r--app-misc/lcdproc-0.5.2-r113
-rw-r--r--app-misc/lcdproc-0.5.514
-rw-r--r--app-misc/lcdproc-0.5.6-r114
-rw-r--r--app-misc/lcdproc/Manifest11
-rw-r--r--app-misc/lcdproc/files/0.5.1-LCDd.initd21
-rw-r--r--app-misc/lcdproc/files/0.5.1-lcdproc.initd20
-rw-r--r--app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd21
-rw-r--r--app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild185
-rw-r--r--app-misc/lcdproc/lcdproc-0.5.5.ebuild191
-rw-r--r--app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild195
-rw-r--r--app-misc/lcdproc/metadata.xml29
-rw-r--r--app-misc/leave-20100918-r110
-rw-r--r--app-misc/leave/Manifest5
-rw-r--r--app-misc/leave/files/README9
-rw-r--r--app-misc/leave/files/leave-fix-makefile.diff20
-rw-r--r--app-misc/leave/leave-20100918-r1.ebuild32
-rw-r--r--app-misc/leave/metadata.xml8
-rw-r--r--app-misc/ledit-2.0314
-rw-r--r--app-misc/ledit/Manifest3
-rw-r--r--app-misc/ledit/ledit-2.03.ebuild41
-rw-r--r--app-misc/ledit/metadata.xml8
-rw-r--r--app-misc/lfm-2.3-r114
-rw-r--r--app-misc/lfm/Manifest4
-rw-r--r--app-misc/lfm/files/lfm-2.3-no-doc.patch12
-rw-r--r--app-misc/lfm/lfm-2.3-r1.ebuild21
-rw-r--r--app-misc/lfm/metadata.xml5
-rw-r--r--app-misc/linux-logo-5.11-r313
-rw-r--r--app-misc/linux-logo-5.11-r413
-rw-r--r--app-misc/linux-logo/Manifest12
-rw-r--r--app-misc/linux-logo/files/gentoo-alt.logo39
-rw-r--r--app-misc/linux-logo/files/gentoo-linux.logo82
-rw-r--r--app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch13
-rw-r--r--app-misc/linux-logo/files/linux-logo-5.11.conf28
-rw-r--r--app-misc/linux-logo/files/linux-logo.init.d36
-rw-r--r--app-misc/linux-logo/files/linux-logo.service9
-rw-r--r--app-misc/linux-logo/files/linux_logo_creator12
-rw-r--r--app-misc/linux-logo/files/logo-config7
-rw-r--r--app-misc/linux-logo/linux-logo-5.11-r3.ebuild76
-rw-r--r--app-misc/linux-logo/linux-logo-5.11-r4.ebuild78
-rw-r--r--app-misc/linux-logo/metadata.xml14
-rw-r--r--app-misc/linuxspa-0.7.1-r210
-rw-r--r--app-misc/linuxspa/Manifest4
-rw-r--r--app-misc/linuxspa/files/linuxspa-0.7.1-compile-fix.patch12
-rw-r--r--app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild40
-rw-r--r--app-misc/linuxspa/metadata.xml9
-rw-r--r--app-misc/lirc-0.10.014
-rw-r--r--app-misc/lirc-0.10.114
-rw-r--r--app-misc/lirc-0.9.0-r614
-rw-r--r--app-misc/lirc/Manifest28
-rw-r--r--app-misc/lirc/files/irexec-confd9
-rw-r--r--app-misc/lirc/files/irexec-initd-0.8.6-r227
-rw-r--r--app-misc/lirc/files/irexec-initd-0.9.4a-r227
-rw-r--r--app-misc/lirc/files/irexec.service10
-rw-r--r--app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch26
-rw-r--r--app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch18
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch658
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch14
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-fixed-font.patch20
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch67
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch50
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch12
-rw-r--r--app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch80
-rw-r--r--app-misc/lirc/files/lirc.service11
-rw-r--r--app-misc/lirc/files/lircd-0.8.6-r251
-rw-r--r--app-misc/lirc/files/lircd.conf.422
-rw-r--r--app-misc/lirc/files/lircm.service11
-rw-r--r--app-misc/lirc/files/lircmd19
-rw-r--r--app-misc/lirc/files/lircmd-0.10.0.conf4
-rw-r--r--app-misc/lirc/files/lircmd-0.9.4a-r219
-rw-r--r--app-misc/lirc/files/modprobed.lirc22
-rw-r--r--app-misc/lirc/lirc-0.10.0.ebuild151
-rw-r--r--app-misc/lirc/lirc-0.10.1.ebuild151
-rw-r--r--app-misc/lirc/lirc-0.9.0-r6.ebuild428
-rw-r--r--app-misc/lirc/metadata.xml25
-rw-r--r--app-misc/livecd-tools-2.210
-rw-r--r--app-misc/livecd-tools-2.310
-rw-r--r--app-misc/livecd-tools-2.410
-rw-r--r--app-misc/livecd-tools-999910
-rw-r--r--app-misc/livecd-tools/Manifest8
-rw-r--r--app-misc/livecd-tools/livecd-tools-2.2.ebuild41
-rw-r--r--app-misc/livecd-tools/livecd-tools-2.3.ebuild41
-rw-r--r--app-misc/livecd-tools/livecd-tools-2.4.ebuild41
-rw-r--r--app-misc/livecd-tools/livecd-tools-9999.ebuild44
-rw-r--r--app-misc/livecd-tools/metadata.xml8
-rw-r--r--app-misc/lockfile-progs-0.1.1712
-rw-r--r--app-misc/lockfile-progs/Manifest4
-rw-r--r--app-misc/lockfile-progs/files/Makefile55
-rw-r--r--app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild34
-rw-r--r--app-misc/lockfile-progs/metadata.xml5
-rw-r--r--app-misc/logitech-applet-0.4_pre1-r312
-rw-r--r--app-misc/logitech-applet/Manifest5
-rw-r--r--app-misc/logitech-applet/files/40-logitech_applet.rules6
-rw-r--r--app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch139
-rw-r--r--app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild33
-rw-r--r--app-misc/logitech-applet/metadata.xml8
-rw-r--r--app-misc/logserial-0.4.210
-rw-r--r--app-misc/logserial/Manifest4
-rw-r--r--app-misc/logserial/files/logserial-0.4.2-gentoo.patch30
-rw-r--r--app-misc/logserial/logserial-0.4.2.ebuild28
-rw-r--r--app-misc/logserial/metadata.xml13
-rw-r--r--app-misc/lsx-0.1-r110
-rw-r--r--app-misc/lsx/Manifest3
-rw-r--r--app-misc/lsx/lsx-0.1-r1.ebuild46
-rw-r--r--app-misc/lsx/metadata.xml6
-rw-r--r--app-misc/ltunify-0.2-r111
-rw-r--r--app-misc/ltunify/Manifest3
-rw-r--r--app-misc/ltunify/ltunify-0.2-r1.ebuild34
-rw-r--r--app-misc/ltunify/metadata.xml8
-rw-r--r--app-misc/lxsplit-0.2.410
-rw-r--r--app-misc/lxsplit-0.2.4-r110
-rw-r--r--app-misc/lxsplit/Manifest4
-rw-r--r--app-misc/lxsplit/lxsplit-0.2.4-r1.ebuild24
-rw-r--r--app-misc/lxsplit/lxsplit-0.2.4.ebuild25
-rw-r--r--app-misc/lxsplit/metadata.xml11
-rw-r--r--app-misc/matew-1.910
-rw-r--r--app-misc/matew/Manifest3
-rw-r--r--app-misc/matew/matew-1.9.ebuild36
-rw-r--r--app-misc/matew/metadata.xml11
-rw-r--r--app-misc/mc-4.8.20-r114
-rw-r--r--app-misc/mc-4.8.20-r214
-rw-r--r--app-misc/mc-4.8.2114
-rw-r--r--app-misc/mc-999912
-rw-r--r--app-misc/mc/Manifest9
-rw-r--r--app-misc/mc/files/mc-4.8.13-tinfo.patch39
-rw-r--r--app-misc/mc/files/mc-4.8.19-selected-size.patch30
-rw-r--r--app-misc/mc/mc-4.8.20-r1.ebuild102
-rw-r--r--app-misc/mc/mc-4.8.20-r2.ebuild105
-rw-r--r--app-misc/mc/mc-4.8.21.ebuild93
-rw-r--r--app-misc/mc/mc-9999.ebuild106
-rw-r--r--app-misc/mc/metadata.xml23
-rw-r--r--app-misc/media-player-info-2313
-rw-r--r--app-misc/media-player-info/Manifest3
-rw-r--r--app-misc/media-player-info/media-player-info-23.ebuild36
-rw-r--r--app-misc/media-player-info/metadata.xml8
-rw-r--r--app-misc/mediacrush-cli-1.1.211
-rw-r--r--app-misc/mediacrush-cli-999910
-rw-r--r--app-misc/mediacrush-cli/Manifest4
-rw-r--r--app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild45
-rw-r--r--app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild44
-rw-r--r--app-misc/mediacrush-cli/metadata.xml11
-rw-r--r--app-misc/mencal-3.011
-rw-r--r--app-misc/mencal/Manifest3
-rw-r--r--app-misc/mencal/mencal-3.0.ebuild23
-rw-r--r--app-misc/mencal/metadata.xml5
-rw-r--r--app-misc/mepl-0.45-r110
-rw-r--r--app-misc/mepl/Manifest4
-rw-r--r--app-misc/mepl/files/mepl-0.45-gcc433.patch16
-rw-r--r--app-misc/mepl/mepl-0.45-r1.ebuild29
-rw-r--r--app-misc/mepl/metadata.xml5
-rw-r--r--app-misc/metadata.xml36
-rw-r--r--app-misc/metromap-0.1.4-r114
-rw-r--r--app-misc/metromap/Manifest3
-rw-r--r--app-misc/metromap/metadata.xml8
-rw-r--r--app-misc/metromap/metromap-0.1.4-r1.ebuild51
-rw-r--r--app-misc/mime-types-99
-rw-r--r--app-misc/mime-types/Manifest3
-rw-r--r--app-misc/mime-types/metadata.xml12
-rw-r--r--app-misc/mime-types/mime-types-9.ebuild21
-rw-r--r--app-misc/mmv-1.01b_p1810
-rw-r--r--app-misc/mmv/Manifest4
-rw-r--r--app-misc/mmv/metadata.xml8
-rw-r--r--app-misc/mmv/mmv-1.01b_p18.ebuild49
-rw-r--r--app-misc/mosquitto-1.4.1413
-rw-r--r--app-misc/mosquitto-1.4.14-r113
-rw-r--r--app-misc/mosquitto-1.4.1514
-rw-r--r--app-misc/mosquitto-1.4.15-r214
-rw-r--r--app-misc/mosquitto/Manifest11
-rw-r--r--app-misc/mosquitto/files/mosquitto24
-rw-r--r--app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch43
-rw-r--r--app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch12
-rw-r--r--app-misc/mosquitto/files/mosquitto.service12
-rw-r--r--app-misc/mosquitto/metadata.xml18
-rw-r--r--app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild97
-rw-r--r--app-misc/mosquitto/mosquitto-1.4.14.ebuild96
-rw-r--r--app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild102
-rw-r--r--app-misc/mosquitto/mosquitto-1.4.15.ebuild99
-rw-r--r--app-misc/mouseremote-0.90-r211
-rw-r--r--app-misc/mouseremote/Manifest8
-rw-r--r--app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff23
-rw-r--r--app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff66
-rw-r--r--app-misc/mouseremote/files/mouseremote-0.90-makefile.diff20
-rw-r--r--app-misc/mouseremote/files/mouseremote.conf13
-rw-r--r--app-misc/mouseremote/files/mouseremote.start28
-rw-r--r--app-misc/mouseremote/metadata.xml5
-rw-r--r--app-misc/mouseremote/mouseremote-0.90-r2.ebuild71
-rw-r--r--app-misc/mswinurl_launcher-1.015
-rw-r--r--app-misc/mswinurl_launcher/Manifest3
-rw-r--r--app-misc/mswinurl_launcher/metadata.xml10
-rw-r--r--app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild54
-rw-r--r--app-misc/mtail-1.1.1-r313
-rw-r--r--app-misc/mtail/Manifest5
-rw-r--r--app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch52
-rw-r--r--app-misc/mtail/metadata.xml15
-rw-r--r--app-misc/mtail/mtail-1.1.1-r3.ebuild30
-rw-r--r--app-misc/muttprint-0.73-r413
-rw-r--r--app-misc/muttprint/Manifest7
-rw-r--r--app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch12
-rw-r--r--app-misc/muttprint/files/muttprint-0.73-manuals.patch140
-rw-r--r--app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch36
-rw-r--r--app-misc/muttprint/files/muttprint-0.73-warning.patch20
-rw-r--r--app-misc/muttprint/metadata.xml20
-rw-r--r--app-misc/muttprint/muttprint-0.73-r4.ebuild77
-rw-r--r--app-misc/mvcase-0.1-r212
-rw-r--r--app-misc/mvcase/Manifest5
-rw-r--r--app-misc/mvcase/files/mvcase-0.1-flags.patch25
-rw-r--r--app-misc/mvcase/files/mvcase-0.1-includes.patch25
-rw-r--r--app-misc/mvcase/metadata.xml5
-rw-r--r--app-misc/mvcase/mvcase-0.1-r2.ebuild32
-rw-r--r--app-misc/neofetch-3.4.011
-rw-r--r--app-misc/neofetch-4.0.211
-rw-r--r--app-misc/neofetch-5.0.011
-rw-r--r--app-misc/neofetch-999911
-rw-r--r--app-misc/neofetch/Manifest8
-rw-r--r--app-misc/neofetch/metadata.xml23
-rw-r--r--app-misc/neofetch/neofetch-3.4.0.ebuild22
-rw-r--r--app-misc/neofetch/neofetch-4.0.2.ebuild28
-rw-r--r--app-misc/neofetch/neofetch-5.0.0.ebuild28
-rw-r--r--app-misc/neofetch/neofetch-9999.ebuild28
-rw-r--r--app-misc/nnn-1.613
-rw-r--r--app-misc/nnn-1.813
-rw-r--r--app-misc/nnn/Manifest5
-rw-r--r--app-misc/nnn/metadata.xml11
-rw-r--r--app-misc/nnn/nnn-1.6.ebuild47
-rw-r--r--app-misc/nnn/nnn-1.8.ebuild47
-rw-r--r--app-misc/no-more-secrets-999910
-rw-r--r--app-misc/no-more-secrets/Manifest2
-rw-r--r--app-misc/no-more-secrets/metadata.xml11
-rw-r--r--app-misc/no-more-secrets/no-more-secrets-9999.ebuild40
-rw-r--r--app-misc/notary-0.6.1-r111
-rw-r--r--app-misc/notary/Manifest7
-rw-r--r--app-misc/notary/files/notary-server.confd2
-rw-r--r--app-misc/notary/files/notary-server.initd19
-rw-r--r--app-misc/notary/files/notary-signer.confd2
-rw-r--r--app-misc/notary/files/notary-signer.initd19
-rw-r--r--app-misc/notary/metadata.xml11
-rw-r--r--app-misc/notary/notary-0.6.1-r1.ebuild46
-rw-r--r--app-misc/note-1.3.3-r113
-rw-r--r--app-misc/note/Manifest3
-rw-r--r--app-misc/note/metadata.xml9
-rw-r--r--app-misc/note/note-1.3.3-r1.ebuild55
-rw-r--r--app-misc/nullmodem-0.0.6-r19
-rw-r--r--app-misc/nullmodem/Manifest3
-rw-r--r--app-misc/nullmodem/metadata.xml21
-rw-r--r--app-misc/nullmodem/nullmodem-0.0.6-r1.ebuild12
-rw-r--r--app-misc/nut-20.110
-rw-r--r--app-misc/nut/Manifest3
-rw-r--r--app-misc/nut/metadata.xml8
-rw-r--r--app-misc/nut/nut-20.1.ebuild28
-rw-r--r--app-misc/ondir-0.2.2-r212
-rw-r--r--app-misc/ondir-0.2.412
-rw-r--r--app-misc/ondir/Manifest5
-rw-r--r--app-misc/ondir/metadata.xml8
-rw-r--r--app-misc/ondir/ondir-0.2.2-r2.ebuild45
-rw-r--r--app-misc/ondir/ondir-0.2.4.ebuild44
-rw-r--r--app-misc/oneko-1.2-r212
-rw-r--r--app-misc/oneko/Manifest7
-rw-r--r--app-misc/oneko/files/oneko-1.2-include.patch10
-rw-r--r--app-misc/oneko/metadata.xml8
-rw-r--r--app-misc/oneko/oneko-1.2-r2.ebuild72
-rw-r--r--app-misc/openastro-1.1.5614
-rw-r--r--app-misc/openastro-data-1.614
-rw-r--r--app-misc/openastro-data-1.714
-rw-r--r--app-misc/openastro-data-1.814
-rw-r--r--app-misc/openastro-data/Manifest7
-rw-r--r--app-misc/openastro-data/metadata.xml12
-rw-r--r--app-misc/openastro-data/openastro-data-1.6.ebuild23
-rw-r--r--app-misc/openastro-data/openastro-data-1.7.ebuild23
-rw-r--r--app-misc/openastro-data/openastro-data-1.8.ebuild24
-rw-r--r--app-misc/openastro/Manifest3
-rw-r--r--app-misc/openastro/metadata.xml16
-rw-r--r--app-misc/openastro/openastro-1.1.56.ebuild34
-rw-r--r--app-misc/pal-0.4.3-r214
-rw-r--r--app-misc/pal/Manifest8
-rw-r--r--app-misc/pal/files/0.4.3-ldflags.patch8
-rw-r--r--app-misc/pal/files/0.4.3-strip.patch17
-rw-r--r--app-misc/pal/files/fix-Wformat-security-errors.patch64
-rw-r--r--app-misc/pal/files/pal-0.4.3-pkg_config.patch14
-rw-r--r--app-misc/pal/files/pal-0.4.3-prefix.patch44
-rw-r--r--app-misc/pal/metadata.xml13
-rw-r--r--app-misc/pal/pal-0.4.3-r2.ebuild61
-rw-r--r--app-misc/pax-utils-1.2.313
-rw-r--r--app-misc/pax-utils-1.2.3-r114
-rw-r--r--app-misc/pax-utils/Manifest4
-rw-r--r--app-misc/pax-utils/metadata.xml16
-rw-r--r--app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild64
-rw-r--r--app-misc/pax-utils/pax-utils-1.2.3.ebuild56
-rw-r--r--app-misc/pdfpc-4.1.113
-rw-r--r--app-misc/pdfpc/Manifest3
-rw-r--r--app-misc/pdfpc/metadata.xml8
-rw-r--r--app-misc/pdfpc/pdfpc-4.1.1.ebuild44
-rw-r--r--app-misc/perltrash-0.3-r110
-rw-r--r--app-misc/perltrash/Manifest3
-rw-r--r--app-misc/perltrash/metadata.xml5
-rw-r--r--app-misc/perltrash/perltrash-0.3-r1.ebuild21
-rw-r--r--app-misc/pet-0.2.313
-rw-r--r--app-misc/pet-0.2.3-r113
-rw-r--r--app-misc/pet-0.2.413
-rw-r--r--app-misc/pet-0.3.013
-rw-r--r--app-misc/pet/Manifest34
-rw-r--r--app-misc/pet/metadata.xml22
-rw-r--r--app-misc/pet/pet-0.2.3-r1.ebuild58
-rw-r--r--app-misc/pet/pet-0.2.3.ebuild62
-rw-r--r--app-misc/pet/pet-0.2.4.ebuild57
-rw-r--r--app-misc/pet/pet-0.3.0.ebuild60
-rw-r--r--app-misc/pfm-2.12.312
-rw-r--r--app-misc/pfm/Manifest3
-rw-r--r--app-misc/pfm/metadata.xml11
-rw-r--r--app-misc/pfm/pfm-2.12.3.ebuild26
-rw-r--r--app-misc/physlock-0.510
-rw-r--r--app-misc/physlock-11-r112
-rw-r--r--app-misc/physlock/Manifest5
-rw-r--r--app-misc/physlock/metadata.xml18
-rw-r--r--app-misc/physlock/physlock-0.5.ebuild22
-rw-r--r--app-misc/physlock/physlock-11-r1.ebuild27
-rw-r--r--app-misc/pip-1.2-r212
-rw-r--r--app-misc/pip/Manifest3
-rw-r--r--app-misc/pip/metadata.xml8
-rw-r--r--app-misc/pip/pip-1.2-r2.ebuild24
-rw-r--r--app-misc/pipeworks-0.4-r110
-rw-r--r--app-misc/pipeworks/Manifest3
-rw-r--r--app-misc/pipeworks/metadata.xml13
-rw-r--r--app-misc/pipeworks/pipeworks-0.4-r1.ebuild28
-rw-r--r--app-misc/plod-1.9-r210
-rw-r--r--app-misc/plod/Manifest4
-rw-r--r--app-misc/plod/files/plodrc2
-rw-r--r--app-misc/plod/metadata.xml5
-rw-r--r--app-misc/plod/plod-1.9-r2.ebuild42
-rw-r--r--app-misc/prog-express-3.7.812
-rw-r--r--app-misc/prog-express/Manifest5
-rw-r--r--app-misc/prog-express/files/pe.exe.config3
-rw-r--r--app-misc/prog-express/metadata.xml16
-rw-r--r--app-misc/prog-express/prog-express-3.7.8.ebuild70
-rw-r--r--app-misc/ps3pf_utils-2.310
-rw-r--r--app-misc/ps3pf_utils/Manifest3
-rw-r--r--app-misc/ps3pf_utils/metadata.xml8
-rw-r--r--app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild23
-rw-r--r--app-misc/pwsafe-0.2.0-r412
-rw-r--r--app-misc/pwsafe/Manifest8
-rw-r--r--app-misc/pwsafe/files/pwsafe-0.2.0-XChangeProperty.patch22
-rw-r--r--app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch48
-rw-r--r--app-misc/pwsafe/files/pwsafe-0.2.0-fake-readline.patch107
-rw-r--r--app-misc/pwsafe/files/pwsafe-0.2.0-man-page-option-syntax.patch30
-rw-r--r--app-misc/pwsafe/files/pwsafe-0.2.0-printf.patch43
-rw-r--r--app-misc/pwsafe/metadata.xml26
-rw-r--r--app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild43
-rw-r--r--app-misc/pysmssend-1.48-r214
-rw-r--r--app-misc/pysmssend/Manifest3
-rw-r--r--app-misc/pysmssend/metadata.xml8
-rw-r--r--app-misc/pysmssend/pysmssend-1.48-r2.ebuild34
-rw-r--r--app-misc/pystopwatch-2012.12.24.1-r113
-rw-r--r--app-misc/pystopwatch/Manifest3
-rw-r--r--app-misc/pystopwatch/metadata.xml8
-rw-r--r--app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild35
-rw-r--r--app-misc/qlcplus-4.11.113
-rw-r--r--app-misc/qlcplus/Manifest3
-rw-r--r--app-misc/qlcplus/metadata.xml11
-rw-r--r--app-misc/qlcplus/qlcplus-4.11.1.ebuild59
-rw-r--r--app-misc/ranger-1.9.114
-rw-r--r--app-misc/ranger-999912
-rw-r--r--app-misc/ranger/Manifest4
-rw-r--r--app-misc/ranger/metadata.xml18
-rw-r--r--app-misc/ranger/ranger-1.9.1.ebuild43
-rw-r--r--app-misc/ranger/ranger-9999.ebuild43
-rw-r--r--app-misc/razertool-0.0.7-r413
-rw-r--r--app-misc/razertool/Manifest3
-rw-r--r--app-misc/razertool/metadata.xml16
-rw-r--r--app-misc/razertool/razertool-0.0.7-r4.ebuild67
-rw-r--r--app-misc/rbutil-1.4.013
-rw-r--r--app-misc/rbutil/Manifest4
-rw-r--r--app-misc/rbutil/files/quazip.patch88
-rw-r--r--app-misc/rbutil/metadata.xml8
-rw-r--r--app-misc/rbutil/rbutil-1.4.0.ebuild62
-rw-r--r--app-misc/realpath-1.1713
-rw-r--r--app-misc/realpath-1.1813
-rw-r--r--app-misc/realpath/Manifest11
-rw-r--r--app-misc/realpath/files/realpath-1.14-no-po4a.patch12
-rw-r--r--app-misc/realpath/files/realpath-1.15-prefix.patch39
-rw-r--r--app-misc/realpath/files/realpath-1.16-nonls.patch29
-rw-r--r--app-misc/realpath/files/realpath-1.17-build.patch43
-rw-r--r--app-misc/realpath/metadata.xml12
-rw-r--r--app-misc/realpath/realpath-1.17.ebuild68
-rw-r--r--app-misc/realpath/realpath-1.18.ebuild74
-rw-r--r--app-misc/recoll-1.23.314
-rw-r--r--app-misc/recoll-1.23.614
-rw-r--r--app-misc/recoll/Manifest6
-rw-r--r--app-misc/recoll/files/recoll-python3.patch17
-rw-r--r--app-misc/recoll/metadata.xml30
-rw-r--r--app-misc/recoll/recoll-1.23.3.ebuild123
-rw-r--r--app-misc/recoll/recoll-1.23.6.ebuild122
-rw-r--r--app-misc/regex-markup-0.10.0-r111
-rw-r--r--app-misc/regex-markup/Manifest4
-rw-r--r--app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch29
-rw-r--r--app-misc/regex-markup/metadata.xml5
-rw-r--r--app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild36
-rw-r--r--app-misc/regionset-0.1-r110
-rw-r--r--app-misc/regionset-0.210
-rw-r--r--app-misc/regionset/Manifest5
-rw-r--r--app-misc/regionset/metadata.xml5
-rw-r--r--app-misc/regionset/regionset-0.1-r1.ebuild35
-rw-r--r--app-misc/regionset/regionset-0.2.ebuild40
-rw-r--r--app-misc/remind-03.01.1511
-rw-r--r--app-misc/remind/Manifest3
-rw-r--r--app-misc/remind/metadata.xml8
-rw-r--r--app-misc/remind/remind-03.01.15.ebuild43
-rw-r--r--app-misc/reptyr-0.6.211
-rw-r--r--app-misc/reptyr/Manifest4
-rw-r--r--app-misc/reptyr/metadata.xml15
-rw-r--r--app-misc/reptyr/reptyr-0.6.2.ebuild39
-rw-r--r--app-misc/resolve-march-native-0.914
-rw-r--r--app-misc/resolve-march-native-0.9.214
-rw-r--r--app-misc/resolve-march-native/Manifest5
-rw-r--r--app-misc/resolve-march-native/metadata.xml11
-rw-r--r--app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild19
-rw-r--r--app-misc/resolve-march-native/resolve-march-native-0.9.ebuild18
-rw-r--r--app-misc/rioutil-1.5.0-r212
-rw-r--r--app-misc/rioutil/Manifest5
-rw-r--r--app-misc/rioutil/files/75-rio.rules38
-rw-r--r--app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch15
-rw-r--r--app-misc/rioutil/metadata.xml8
-rw-r--r--app-misc/rioutil/rioutil-1.5.0-r2.ebuild34
-rw-r--r--app-misc/rl-0.2.7-r111
-rw-r--r--app-misc/rl/Manifest3
-rw-r--r--app-misc/rl/metadata.xml12
-rw-r--r--app-misc/rl/rl-0.2.7-r1.ebuild31
-rw-r--r--app-misc/rlwrap-0.4212
-rw-r--r--app-misc/rlwrap-0.42-r112
-rw-r--r--app-misc/rlwrap-0.4312
-rw-r--r--app-misc/rlwrap/Manifest6
-rw-r--r--app-misc/rlwrap/metadata.xml18
-rw-r--r--app-misc/rlwrap/rlwrap-0.42-r1.ebuild21
-rw-r--r--app-misc/rlwrap/rlwrap-0.42.ebuild26
-rw-r--r--app-misc/rlwrap/rlwrap-0.43.ebuild21
-rw-r--r--app-misc/rox-filer-2.1113
-rw-r--r--app-misc/rox-filer/Manifest5
-rw-r--r--app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch15
-rw-r--r--app-misc/rox-filer/files/rox.desktop9
-rw-r--r--app-misc/rox-filer/metadata.xml29
-rw-r--r--app-misc/rox-filer/rox-filer-2.11.ebuild70
-rw-r--r--app-misc/rq-0.10.412
-rw-r--r--app-misc/rq/Manifest111
-rw-r--r--app-misc/rq/metadata.xml11
-rw-r--r--app-misc/rq/rq-0.10.4.ebuild148
-rw-r--r--app-misc/rundeck-bin-2.6.813
-rw-r--r--app-misc/rundeck-bin/Manifest6
-rw-r--r--app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch55
-rw-r--r--app-misc/rundeck-bin/files/rundeckd.initd16
-rw-r--r--app-misc/rundeck-bin/metadata.xml15
-rw-r--r--app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild49
-rw-r--r--app-misc/rundeck-cli-bin-0.1.1113
-rw-r--r--app-misc/rundeck-cli-bin-0.1.813
-rw-r--r--app-misc/rundeck-cli-bin/Manifest5
-rw-r--r--app-misc/rundeck-cli-bin/metadata.xml19
-rw-r--r--app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild26
-rw-r--r--app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild26
-rw-r--r--app-misc/scope-0.04-r110
-rw-r--r--app-misc/scope/Manifest3
-rw-r--r--app-misc/scope/metadata.xml13
-rw-r--r--app-misc/scope/scope-0.04-r1.ebuild22
-rw-r--r--app-misc/screen-4.4.013
-rw-r--r--app-misc/screen-4.5.113
-rw-r--r--app-misc/screen-4.6.013
-rw-r--r--app-misc/screen-4.6.113
-rw-r--r--app-misc/screen-4.6.213
-rw-r--r--app-misc/screen-999912
-rw-r--r--app-misc/screen/Manifest17
-rw-r--r--app-misc/screen/files/screen-4.3.0-no-utempter.patch14
-rw-r--r--app-misc/screen/files/screen-4.4.0-utmp-musl.patch62
-rw-r--r--app-misc/screen/files/screen-4.5.1-texinfo.patch13
-rw-r--r--app-misc/screen/files/screen-4.6.2-utmp-exit.patch55
-rw-r--r--app-misc/screen/files/screenrc356
-rw-r--r--app-misc/screen/metadata.xml35
-rw-r--r--app-misc/screen/screen-4.4.0.ebuild154
-rw-r--r--app-misc/screen/screen-4.5.1.ebuild160
-rw-r--r--app-misc/screen/screen-4.6.0.ebuild158
-rw-r--r--app-misc/screen/screen-4.6.1.ebuild158
-rw-r--r--app-misc/screen/screen-4.6.2.ebuild159
-rw-r--r--app-misc/screen/screen-9999.ebuild149
-rw-r--r--app-misc/screenfetch-3.8.011
-rw-r--r--app-misc/screenfetch-999911
-rw-r--r--app-misc/screenfetch/Manifest4
-rw-r--r--app-misc/screenfetch/metadata.xml18
-rw-r--r--app-misc/screenfetch/screenfetch-3.8.0.ebuild35
-rw-r--r--app-misc/screenfetch/screenfetch-9999.ebuild35
-rw-r--r--app-misc/screenie-1.30.0-r110
-rw-r--r--app-misc/screenie/Manifest4
-rw-r--r--app-misc/screenie/files/screenie-CVE-2008-5371.patch26
-rw-r--r--app-misc/screenie/metadata.xml22
-rw-r--r--app-misc/screenie/screenie-1.30.0-r1.ebuild22
-rw-r--r--app-misc/scrub-2.5.29
-rw-r--r--app-misc/scrub-2.6.19
-rw-r--r--app-misc/scrub/Manifest5
-rw-r--r--app-misc/scrub/metadata.xml13
-rw-r--r--app-misc/scrub/scrub-2.5.2.ebuild16
-rw-r--r--app-misc/scrub/scrub-2.6.1.ebuild16
-rw-r--r--app-misc/selecta-0.0.710
-rw-r--r--app-misc/selecta-999910
-rw-r--r--app-misc/selecta/Manifest4
-rw-r--r--app-misc/selecta/metadata.xml12
-rw-r--r--app-misc/selecta/selecta-0.0.7.ebuild28
-rw-r--r--app-misc/selecta/selecta-9999.ebuild28
-rw-r--r--app-misc/skim-0.3.213
-rw-r--r--app-misc/skim/Manifest32
-rw-r--r--app-misc/skim/metadata.xml15
-rw-r--r--app-misc/skim/skim-0.3.2.ebuild74
-rw-r--r--app-misc/sl-5.0213
-rw-r--r--app-misc/sl/Manifest3
-rw-r--r--app-misc/sl/metadata.xml17
-rw-r--r--app-misc/sl/sl-5.02.ebuild39
-rw-r--r--app-misc/sleepyhead-1.0.0_beta212
-rw-r--r--app-misc/sleepyhead/Manifest4
-rw-r--r--app-misc/sleepyhead/files/common_gui.patch12
-rw-r--r--app-misc/sleepyhead/metadata.xml11
-rw-r--r--app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild53
-rw-r--r--app-misc/slmon-0.5.1313
-rw-r--r--app-misc/slmon/Manifest5
-rw-r--r--app-misc/slmon/files/slmon-0.5.13-invalid-free.patch18
-rw-r--r--app-misc/slmon/files/slmon-0.5.13-make-382.patch11
-rw-r--r--app-misc/slmon/metadata.xml8
-rw-r--r--app-misc/slmon/slmon-0.5.13.ebuild41
-rw-r--r--app-misc/smtm-1.6.10-r112
-rw-r--r--app-misc/smtm/Manifest3
-rw-r--r--app-misc/smtm/metadata.xml5
-rw-r--r--app-misc/smtm/smtm-1.6.10-r1.ebuild32
-rw-r--r--app-misc/socnetv-2.213
-rw-r--r--app-misc/socnetv/Manifest4
-rw-r--r--app-misc/socnetv/files/socnetv-2.2-deps.patch10
-rw-r--r--app-misc/socnetv/metadata.xml19
-rw-r--r--app-misc/socnetv/socnetv-2.2.ebuild45
-rw-r--r--app-misc/solaar-0.9.2-r314
-rw-r--r--app-misc/solaar/Manifest3
-rw-r--r--app-misc/solaar/metadata.xml8
-rw-r--r--app-misc/solaar/solaar-0.9.2-r3.ebuild58
-rw-r--r--app-misc/sonypid-1.912
-rw-r--r--app-misc/sonypid/Manifest3
-rw-r--r--app-misc/sonypid/metadata.xml5
-rw-r--r--app-misc/sonypid/sonypid-1.9.ebuild28
-rw-r--r--app-misc/spacenavd-0.5-r513
-rw-r--r--app-misc/spacenavd-0.5-r613
-rw-r--r--app-misc/spacenavd-0.613
-rw-r--r--app-misc/spacenavd/Manifest14
-rw-r--r--app-misc/spacenavd/files/99-space-navigator.rules5
-rw-r--r--app-misc/spacenavd/files/99-space-navigator.rules-r16
-rw-r--r--app-misc/spacenavd/files/99-space-navigator.rules-r26
-rw-r--r--app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch67
-rw-r--r--app-misc/spacenavd/files/spacenavd-0.5-destdir.patch16
-rw-r--r--app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch13
-rw-r--r--app-misc/spacenavd/files/spacenavd.service8
-rw-r--r--app-misc/spacenavd/files/spnavd27
-rw-r--r--app-misc/spacenavd/metadata.xml28
-rw-r--r--app-misc/spacenavd/spacenavd-0.5-r5.ebuild81
-rw-r--r--app-misc/spacenavd/spacenavd-0.5-r6.ebuild80
-rw-r--r--app-misc/spacenavd/spacenavd-0.6.ebuild78
-rw-r--r--app-misc/sphinx-2.0.1013
-rw-r--r--app-misc/sphinx-2.1.913
-rw-r--r--app-misc/sphinx-2.2.1113
-rw-r--r--app-misc/sphinx/Manifest10
-rw-r--r--app-misc/sphinx/files/searchd.rc31
-rw-r--r--app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch22
-rw-r--r--app-misc/sphinx/metadata.xml12
-rw-r--r--app-misc/sphinx/sphinx-2.0.10.ebuild100
-rw-r--r--app-misc/sphinx/sphinx-2.1.9.ebuild89
-rw-r--r--app-misc/sphinx/sphinx-2.2.11.ebuild91
-rw-r--r--app-misc/splitvt-1.6.6-r312
-rw-r--r--app-misc/splitvt/Manifest5
-rw-r--r--app-misc/splitvt/files/1.6.6-ldflags.patch23
-rw-r--r--app-misc/splitvt/metadata.xml8
-rw-r--r--app-misc/splitvt/splitvt-1.6.6-r3.ebuild51
-rw-r--r--app-misc/srm-1.2.1512
-rw-r--r--app-misc/srm/Manifest4
-rw-r--r--app-misc/srm/files/srm-1.2.15-cflags.patch10
-rw-r--r--app-misc/srm/metadata.xml11
-rw-r--r--app-misc/srm/srm-1.2.15.ebuild36
-rw-r--r--app-misc/supercat-0.5.5-r29
-rw-r--r--app-misc/supercat-0.5.69
-rw-r--r--app-misc/supercat/Manifest5
-rw-r--r--app-misc/supercat/metadata.xml8
-rw-r--r--app-misc/supercat/supercat-0.5.5-r2.ebuild20
-rw-r--r--app-misc/supercat/supercat-0.5.6.ebuild20
-rw-r--r--app-misc/symlinks-1.4-r311
-rw-r--r--app-misc/symlinks/Manifest3
-rw-r--r--app-misc/symlinks/metadata.xml15
-rw-r--r--app-misc/symlinks/symlinks-1.4-r3.ebuild36
-rw-r--r--app-misc/tails-installer-4.4.1114
-rw-r--r--app-misc/tails-installer-4.4.814
-rw-r--r--app-misc/tails-installer/Manifest7
-rw-r--r--app-misc/tails-installer/files/fix-desktop-file.patch28
-rw-r--r--app-misc/tails-installer/files/sgdisk.patch29
-rw-r--r--app-misc/tails-installer/metadata.xml11
-rw-r--r--app-misc/tails-installer/tails-installer-4.4.11.ebuild48
-rw-r--r--app-misc/tails-installer/tails-installer-4.4.8.ebuild48
-rw-r--r--app-misc/task-2.5.1-r113
-rw-r--r--app-misc/task/Manifest4
-rw-r--r--app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch23
-rw-r--r--app-misc/task/metadata.xml11
-rw-r--r--app-misc/task/task-2.5.1-r1.ebuild58
-rw-r--r--app-misc/taskd-1.1.0-r112
-rw-r--r--app-misc/taskd/Manifest7
-rw-r--r--app-misc/taskd/files/config17
-rw-r--r--app-misc/taskd/files/taskd.confd1
-rw-r--r--app-misc/taskd/files/taskd.initd15
-rw-r--r--app-misc/taskd/files/taskd.logrotate8
-rw-r--r--app-misc/taskd/metadata.xml8
-rw-r--r--app-misc/taskd/taskd-1.1.0-r1.ebuild84
-rw-r--r--app-misc/tdfsb-0.0.1012
-rw-r--r--app-misc/tdfsb-0.0.10-r112
-rw-r--r--app-misc/tdfsb/Manifest7
-rw-r--r--app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch23
-rw-r--r--app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch28
-rw-r--r--app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch26
-rw-r--r--app-misc/tdfsb/metadata.xml4
-rw-r--r--app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild43
-rw-r--r--app-misc/tdfsb/tdfsb-0.0.10.ebuild42
-rw-r--r--app-misc/tdl-1.5.2-r213
-rw-r--r--app-misc/tdl/Manifest8
-rw-r--r--app-misc/tdl/files/1.5.2-ldflags.patch13
-rw-r--r--app-misc/tdl/files/tdl-1.5.2-list.c.patch34
-rw-r--r--app-misc/tdl/files/tdl-1.5.2-main.c.patch178
-rw-r--r--app-misc/tdl/files/tdl-1.5.2-man.patch507
-rw-r--r--app-misc/tdl/metadata.xml13
-rw-r--r--app-misc/tdl/tdl-1.5.2-r2.ebuild75
-rw-r--r--app-misc/tek-1.3.013
-rw-r--r--app-misc/tek/Manifest3
-rw-r--r--app-misc/tek/metadata.xml11
-rw-r--r--app-misc/tek/tek-1.3.0.ebuild44
-rw-r--r--app-misc/terminal-colors-2.213
-rw-r--r--app-misc/terminal-colors/Manifest3
-rw-r--r--app-misc/terminal-colors/metadata.xml8
-rw-r--r--app-misc/terminal-colors/terminal-colors-2.2.ebuild25
-rw-r--r--app-misc/timestamp-1.1-r111
-rw-r--r--app-misc/timestamp/Manifest3
-rw-r--r--app-misc/timestamp/metadata.xml8
-rw-r--r--app-misc/timestamp/timestamp-1.1-r1.ebuild22
-rw-r--r--app-misc/timew-1.0.011
-rw-r--r--app-misc/timew-1.1.111
-rw-r--r--app-misc/timew/Manifest5
-rw-r--r--app-misc/timew/metadata.xml8
-rw-r--r--app-misc/timew/timew-1.0.0.ebuild25
-rw-r--r--app-misc/timew/timew-1.1.1.ebuild25
-rw-r--r--app-misc/tkpasman-2.2b13
-rw-r--r--app-misc/tkpasman/Manifest4
-rw-r--r--app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch22
-rw-r--r--app-misc/tkpasman/metadata.xml5
-rw-r--r--app-misc/tkpasman/tkpasman-2.2b.ebuild39
-rw-r--r--app-misc/tmate-2.2.0-r113
-rw-r--r--app-misc/tmate-2.2.113
-rw-r--r--app-misc/tmate/Manifest6
-rw-r--r--app-misc/tmate/metadata.xml11
-rw-r--r--app-misc/tmate/tmate-2.2.0-r1.ebuild52
-rw-r--r--app-misc/tmate/tmate-2.2.1.ebuild52
-rw-r--r--app-misc/tmux-2.613
-rw-r--r--app-misc/tmux-2.713
-rw-r--r--app-misc/tmux-999912
-rw-r--r--app-misc/tmux-mem-cpu-load-3.4.011
-rw-r--r--app-misc/tmux-mem-cpu-load-99999
-rw-r--r--app-misc/tmux-mem-cpu-load/Manifest4
-rw-r--r--app-misc/tmux-mem-cpu-load/metadata.xml7
-rw-r--r--app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild24
-rw-r--r--app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild24
-rw-r--r--app-misc/tmux-xpanes-2.2.213
-rw-r--r--app-misc/tmux-xpanes-3.0.013
-rw-r--r--app-misc/tmux-xpanes/Manifest5
-rw-r--r--app-misc/tmux-xpanes/metadata.xml15
-rw-r--r--app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild36
-rw-r--r--app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild36
-rw-r--r--app-misc/tmux/Manifest9
-rw-r--r--app-misc/tmux/files/tmux-2.4-flags.patch15
-rw-r--r--app-misc/tmux/metadata.xml20
-rw-r--r--app-misc/tmux/tmux-2.6.ebuild89
-rw-r--r--app-misc/tmux/tmux-2.7.ebuild89
-rw-r--r--app-misc/tmux/tmux-9999.ebuild94
-rw-r--r--app-misc/todo-2.10-r212
-rw-r--r--app-misc/todo/Manifest4
-rw-r--r--app-misc/todo/files/todo-2.10-fix-bash-completion.patch12
-rw-r--r--app-misc/todo/metadata.xml11
-rw-r--r--app-misc/todo/todo-2.10-r2.ebuild58
-rw-r--r--app-misc/toilet-0.311
-rw-r--r--app-misc/toilet/Manifest3
-rw-r--r--app-misc/toilet/metadata.xml8
-rw-r--r--app-misc/toilet/toilet-0.3.ebuild28
-rw-r--r--app-misc/towitoko-2.0.7-r210
-rw-r--r--app-misc/towitoko-2.0.7-r310
-rw-r--r--app-misc/towitoko/Manifest4
-rw-r--r--app-misc/towitoko/metadata.xml9
-rw-r--r--app-misc/towitoko/towitoko-2.0.7-r2.ebuild39
-rw-r--r--app-misc/towitoko/towitoko-2.0.7-r3.ebuild30
-rw-r--r--app-misc/tpconfig-3.1.3-r110
-rw-r--r--app-misc/tpconfig-3.1.3-r210
-rw-r--r--app-misc/tpconfig/Manifest6
-rw-r--r--app-misc/tpconfig/files/tpconfig22
-rw-r--r--app-misc/tpconfig/files/tpconfig.conf4
-rw-r--r--app-misc/tpconfig/metadata.xml5
-rw-r--r--app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild27
-rw-r--r--app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild27
-rw-r--r--app-misc/tpipe-1.6-r110
-rw-r--r--app-misc/tpipe/Manifest3
-rw-r--r--app-misc/tpipe/metadata.xml11
-rw-r--r--app-misc/tpipe/tpipe-1.6-r1.ebuild29
-rw-r--r--app-misc/tprint-1.1.0-r110
-rw-r--r--app-misc/tprint/Manifest3
-rw-r--r--app-misc/tprint/metadata.xml9
-rw-r--r--app-misc/tprint/tprint-1.1.0-r1.ebuild34
-rw-r--r--app-misc/tracker-1.12.415
-rw-r--r--app-misc/tracker/Manifest3
-rw-r--r--app-misc/tracker/metadata.xml30
-rw-r--r--app-misc/tracker/tracker-1.12.4.ebuild249
-rw-r--r--app-misc/trash-cli-0.12.9.14-r214
-rw-r--r--app-misc/trash-cli-0.16.12.2914
-rw-r--r--app-misc/trash-cli-0.17.1.1414
-rw-r--r--app-misc/trash-cli/Manifest7
-rw-r--r--app-misc/trash-cli/metadata.xml27
-rw-r--r--app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild20
-rw-r--r--app-misc/trash-cli/trash-cli-0.16.12.29.ebuild19
-rw-r--r--app-misc/trash-cli/trash-cli-0.17.1.14.ebuild18
-rw-r--r--app-misc/ttyload-0.5.312
-rw-r--r--app-misc/ttyload/Manifest3
-rw-r--r--app-misc/ttyload/metadata.xml12
-rw-r--r--app-misc/ttyload/ttyload-0.5.3.ebuild36
-rw-r--r--app-misc/ttyrec-1.0.8-r210
-rw-r--r--app-misc/ttyrec/Manifest4
-rw-r--r--app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch19
-rw-r--r--app-misc/ttyrec/metadata.xml15
-rw-r--r--app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild27
-rw-r--r--app-misc/ttysnoop-0.12d10
-rw-r--r--app-misc/ttysnoop/Manifest5
-rw-r--r--app-misc/ttysnoop/files/pinkbyte_masking.patch41
-rw-r--r--app-misc/ttysnoop/files/ttysnoop-makefile.patch36
-rw-r--r--app-misc/ttysnoop/metadata.xml8
-rw-r--r--app-misc/ttysnoop/ttysnoop-0.12d.ebuild44
-rw-r--r--app-misc/unfoo-1.0.812
-rw-r--r--app-misc/unfoo/Manifest3
-rw-r--r--app-misc/unfoo/metadata.xml14
-rw-r--r--app-misc/unfoo/unfoo-1.0.8.ebuild50
-rw-r--r--app-misc/uptimed-0.4.0-r112
-rw-r--r--app-misc/uptimed-0.4.112
-rw-r--r--app-misc/uptimed/Manifest7
-rw-r--r--app-misc/uptimed/files/uptimed.init-r118
-rw-r--r--app-misc/uptimed/files/uptimed.service10
-rw-r--r--app-misc/uptimed/metadata.xml11
-rw-r--r--app-misc/uptimed/uptimed-0.4.0-r1.ebuild53
-rw-r--r--app-misc/uptimed/uptimed-0.4.1.ebuild51
-rw-r--r--app-misc/utimer-0.4-r111
-rw-r--r--app-misc/utimer/Manifest3
-rw-r--r--app-misc/utimer/metadata.xml16
-rw-r--r--app-misc/utimer/utimer-0.4-r1.ebuild32
-rw-r--r--app-misc/vcontrold-0.98.513
-rw-r--r--app-misc/vcontrold/Manifest4
-rw-r--r--app-misc/vcontrold/files/vcontrold5
-rw-r--r--app-misc/vcontrold/metadata.xml28
-rw-r--r--app-misc/vcontrold/vcontrold-0.98.5.ebuild43
-rw-r--r--app-misc/vcp-2.2-r212
-rw-r--r--app-misc/vcp/Manifest4
-rw-r--r--app-misc/vcp/files/vcp-2.2-tinfo.patch11
-rw-r--r--app-misc/vcp/metadata.xml8
-rw-r--r--app-misc/vcp/vcp-2.2-r2.ebuild35
-rw-r--r--app-misc/vifm-0.913
-rw-r--r--app-misc/vifm-0.9.113
-rw-r--r--app-misc/vifm/Manifest6
-rw-r--r--app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch60
-rw-r--r--app-misc/vifm/metadata.xml31
-rw-r--r--app-misc/vifm/vifm-0.9.1.ebuild106
-rw-r--r--app-misc/vifm/vifm-0.9.ebuild96
-rw-r--r--app-misc/vit-1.2-r113
-rw-r--r--app-misc/vit-999910
-rw-r--r--app-misc/vit/Manifest6
-rw-r--r--app-misc/vit/files/vit-allow-nonsudo-install.patch36
-rw-r--r--app-misc/vit/files/vit-fix-man-installs.patch19
-rw-r--r--app-misc/vit/metadata.xml13
-rw-r--r--app-misc/vit/vit-1.2-r1.ebuild38
-rw-r--r--app-misc/vit/vit-9999.ebuild40
-rw-r--r--app-misc/vittk-1.312
-rw-r--r--app-misc/vittk/Manifest6
-rw-r--r--app-misc/vittk/files/vittk-1.1.1-dirs.patch66
-rw-r--r--app-misc/vittk/files/vittk-1.3-configure.patch32
-rw-r--r--app-misc/vittk/files/vittk-1.3-makefile.patch87
-rw-r--r--app-misc/vittk/metadata.xml10
-rw-r--r--app-misc/vittk/vittk-1.3.ebuild32
-rw-r--r--app-misc/vlock-2.2.3-r113
-rw-r--r--app-misc/vlock/Manifest5
-rw-r--r--app-misc/vlock/files/vlock-2.2.2-asneeded.patch11
-rw-r--r--app-misc/vlock/files/vlock-2.2.2-test_process.patch28
-rw-r--r--app-misc/vlock/metadata.xml8
-rw-r--r--app-misc/vlock/vlock-2.2.3-r1.ebuild56
-rw-r--r--app-misc/vzstats-0.3.212
-rw-r--r--app-misc/vzstats-0.412
-rw-r--r--app-misc/vzstats-0.5.112
-rw-r--r--app-misc/vzstats/Manifest7
-rw-r--r--app-misc/vzstats/metadata.xml23
-rw-r--r--app-misc/vzstats/vzstats-0.3.2.ebuild30
-rw-r--r--app-misc/vzstats/vzstats-0.4.ebuild30
-rw-r--r--app-misc/vzstats/vzstats-0.5.1.ebuild30
-rw-r--r--app-misc/wcd-5.2.713
-rw-r--r--app-misc/wcd-5.3.413
-rw-r--r--app-misc/wcd-6.0.113
-rw-r--r--app-misc/wcd-6.0.213
-rw-r--r--app-misc/wcd/Manifest13
-rw-r--r--app-misc/wcd/files/wcd-5.2.5-gentoo.patch72
-rw-r--r--app-misc/wcd/files/wcd-5.3.4-gentoo.patch67
-rw-r--r--app-misc/wcd/files/wcd-6.0.1-gentoo.patch67
-rw-r--r--app-misc/wcd/files/wcd-6.0.2-gentoo.patch67
-rw-r--r--app-misc/wcd/metadata.xml8
-rw-r--r--app-misc/wcd/wcd-5.2.7.ebuild44
-rw-r--r--app-misc/wcd/wcd-5.3.4.ebuild50
-rw-r--r--app-misc/wcd/wcd-6.0.1.ebuild44
-rw-r--r--app-misc/wcd/wcd-6.0.2.ebuild43
-rw-r--r--app-misc/webcomics-collector-0.7.3-r114
-rw-r--r--app-misc/webcomics-collector/Manifest3
-rw-r--r--app-misc/webcomics-collector/metadata.xml5
-rw-r--r--app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild37
-rw-r--r--app-misc/when-1.1.3611
-rw-r--r--app-misc/when-1.1.3711
-rw-r--r--app-misc/when/Manifest5
-rw-r--r--app-misc/when/metadata.xml8
-rw-r--r--app-misc/when/when-1.1.36.ebuild41
-rw-r--r--app-misc/when/when-1.1.37.ebuild41
-rw-r--r--app-misc/wipe-2.3.111
-rw-r--r--app-misc/wipe/Manifest4
-rw-r--r--app-misc/wipe/files/wipe-2.3.1-LDFLAGS.patch19
-rw-r--r--app-misc/wipe/metadata.xml11
-rw-r--r--app-misc/wipe/wipe-2.3.1.ebuild43
-rw-r--r--app-misc/worker-2.19.613
-rw-r--r--app-misc/worker-3.8.313
-rw-r--r--app-misc/worker/Manifest5
-rw-r--r--app-misc/worker/metadata.xml15
-rw-r--r--app-misc/worker/worker-2.19.6.ebuild54
-rw-r--r--app-misc/worker/worker-3.8.3.ebuild54
-rw-r--r--app-misc/workrave-1.10.2014
-rw-r--r--app-misc/workrave/Manifest4
-rw-r--r--app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch23
-rw-r--r--app-misc/workrave/metadata.xml22
-rw-r--r--app-misc/workrave/workrave-1.10.20.ebuild104
-rw-r--r--app-misc/wyrd-1.4.6-r112
-rw-r--r--app-misc/wyrd/Manifest3
-rw-r--r--app-misc/wyrd/metadata.xml15
-rw-r--r--app-misc/wyrd/wyrd-1.4.6-r1.ebuild34
-rw-r--r--app-misc/xmind-3.5.3.201506180105-r212
-rw-r--r--app-misc/xmind-3.7.6_p20180131181413
-rw-r--r--app-misc/xmind/Manifest10
-rw-r--r--app-misc/xmind/files/xmind-3.4.0-config.ini20
-rw-r--r--app-misc/xmind/files/xmind-wrapper8
-rw-r--r--app-misc/xmind/files/xmind-wrapper-3.5.38
-rw-r--r--app-misc/xmind/files/xmind-wrapper-3.7.08
-rw-r--r--app-misc/xmind/metadata.xml8
-rw-r--r--app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild88
-rw-r--r--app-misc/xmind/xmind-3.7.6_p201801311814.ebuild92
-rw-r--r--app-misc/yagtd-0.3.4-r114
-rw-r--r--app-misc/yagtd/Manifest3
-rw-r--r--app-misc/yagtd/metadata.xml13
-rw-r--r--app-misc/yagtd/yagtd-0.3.4-r1.ebuild34
-rw-r--r--app-misc/yq-2.1.214
-rw-r--r--app-misc/yq-2.3.014
-rw-r--r--app-misc/yq-2.3.314
-rw-r--r--app-misc/yq-2.3.414
-rw-r--r--app-misc/yq/Manifest9
-rw-r--r--app-misc/yq/metadata.xml11
-rw-r--r--app-misc/yq/yq-2.1.2.ebuild24
-rw-r--r--app-misc/yq/yq-2.3.0.ebuild24
-rw-r--r--app-misc/yq/yq-2.3.3.ebuild24
-rw-r--r--app-misc/yq/yq-2.3.4.ebuild24
-rw-r--r--app-misc/ytree-1.99_p112
-rw-r--r--app-misc/ytree/Manifest4
-rw-r--r--app-misc/ytree/files/ytree-1.94-bindir.patch11
-rw-r--r--app-misc/ytree/metadata.xml7
-rw-r--r--app-misc/ytree/ytree-1.99_p1.ebuild38
-rw-r--r--app-misc/yworklog-0.0.714
-rw-r--r--app-misc/yworklog/Manifest3
-rw-r--r--app-misc/yworklog/metadata.xml9
-rw-r--r--app-misc/yworklog/yworklog-0.0.7.ebuild25
-rw-r--r--app-misc/zisofs-tools-1.0.813
-rw-r--r--app-misc/zisofs-tools/Manifest3
-rw-r--r--app-misc/zisofs-tools/metadata.xml5
-rw-r--r--app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild28
-rw-r--r--app-misc/zygrib-8.0.1-r113
-rw-r--r--app-misc/zygrib/Manifest10
-rw-r--r--app-misc/zygrib/files/zygrib-8.0.1-libs.patch20
-rw-r--r--app-misc/zygrib/files/zygrib.desktop11
-rw-r--r--app-misc/zygrib/metadata.xml10
-rw-r--r--app-misc/zygrib/zygrib-8.0.1-r1.ebuild67
1825 files changed, 42169 insertions, 5346 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b7b6f9136807..a97901a31479 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/abduco-0.5 b/app-misc/abduco-0.5
deleted file mode 100644
index b3ea1c39fa60..000000000000
--- a/app-misc/abduco-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=lightweight session manager with {de,at}tach support
-EAPI=5
-HOMEPAGE=http://www.brain-dump.org/projects/abduco/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/abduco/abduco-0.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34c5eb6cd97936c5572c047227432e8e
diff --git a/app-misc/abduco-0.6 b/app-misc/abduco-0.6
deleted file mode 100644
index 74ab5af1a47e..000000000000
--- a/app-misc/abduco-0.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=lightweight session manager with {de,at}tach support
-EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/abduco/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/abduco/abduco-0.6.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=05518e0cb411cff01a811c8d6308b2c6
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
new file mode 100644
index 000000000000..5312a51bc7e1
--- /dev/null
+++ b/app-misc/abduco/Manifest
@@ -0,0 +1,5 @@
+DIST abduco-0.5.tar.gz 15790 BLAKE2B 6541c758aa5b2ece2f4eae744e9d9da7f8b4cf0d1e39546708e73631688d31c71c74af31e65cdb26bb046b6bf7f595409c0a71027c681fba1d4b3997020b1428 SHA512 e0772b8eecc1fb6f16c7516a6956825b9bda4149f00f56b34e68ec3544f74c2270ba8cc2642599de26ae34d11ed78b8bba70497bfc9a79f3008f50de02ce49d8
+DIST abduco-0.6.tar.gz 15829 BLAKE2B fd6c1670e0a4cf95bfaa00734b981c23877b79ffc14dadae8c84fb198cb4f585cdacf874e127190b6f8c8b784cdfa403a8be0f4cae8bc442d43723967f4525d7 SHA512 3b70a5cc10f0a2743dcbdf6eebdcfcee0e4f4ff8c6ce0bf0aa9f55c3fa85ab43aa659997735e063eab36aba69f91be7bb5519f3f632bff1b9098f5179165c1f2
+EBUILD abduco-0.5.ebuild 850 BLAKE2B bc7ef19288730e9e4c867d8df3d95f8eee6c2d7efea37347c1ea33a24f2b952d9f53c15b03c978e00c56d3d8b2d78ccada1f72202f648436e6b7084fda6c9b48 SHA512 9635efe7b043c02b3fbeee37ae1b6f3c35cd95782d4dcd7d00e0550d95b49f283419eda86f94f58849b76b2b2ca082efaeb3bd1483901d74fb94f4931ae313a2
+EBUILD abduco-0.6.ebuild 840 BLAKE2B 5dff2465e0a29ddbfe5aa217b773cf84c26601c8eab4bfb4467a7af4df9a52a74ac38af89aacd8d8b005581db75c3773ceb5b0256db2488b8f949cc5eeaaf97f SHA512 ca7b46ee13e03afa73a60f8b301b91720fef4e6aefa457cbb4e42ad3ca897f8e6a587e133f974fac6b729c9a40f0673ab2ed6e788cf677d7970edc273217f336
+MISC metadata.xml 808 BLAKE2B e82f42857bd2b16bc5d9e1990c47ef5aeec447b4e15308300fc81b8591c310a5f6b5aa7007d55cf28af7d463449b6642a7ace512c49ff20f05156f95a60ed9d3 SHA512 683ee33b44b4b6ff3c7d265a4a66b81285b1b65c94ab3264fdb502c3bb5108ae81e39b8c560675b77037ff1b8bbe46cfa714b53847bde86b1f7f590df9788e46
diff --git a/app-misc/abduco/abduco-0.5.ebuild b/app-misc/abduco/abduco-0.5.ebuild
new file mode 100644
index 000000000000..569c89575b42
--- /dev/null
+++ b/app-misc/abduco/abduco-0.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="lightweight session manager with {de,at}tach support"
+HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
+SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ sed -e 's:^PREFIX.*:PREFIX = /usr:' \
+ -e 's/-Os//' \
+ -e '/^CC/d' \
+ -i config.mk || die
+
+ sed -e "s/VERSION/${PV}/g" \
+ -i ${PN}.1 || die
+
+ sed -e '/@echo CC/d' \
+ -e 's|@${CC}|$(CC)|g' \
+ -i Makefile || die
+
+ restore_config config.def.h
+ epatch_user
+
+ tc-export CC
+}
+
+src_test() {
+ ./testsuite.sh || die
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README.md
+ doman ${PN}.1
+
+ save_config config.def.h
+}
diff --git a/app-misc/abduco/abduco-0.6.ebuild b/app-misc/abduco/abduco-0.6.ebuild
new file mode 100644
index 000000000000..43df63cf6123
--- /dev/null
+++ b/app-misc/abduco/abduco-0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="lightweight session manager with {de,at}tach support"
+HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
+SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ sed -e 's:^PREFIX.*:PREFIX = /usr:' \
+ -e 's/-Os//' \
+ -e '/^CC/d' \
+ -i config.mk || die
+
+ sed -e "s/VERSION/${PV}/g" \
+ -i ${PN}.1 || die
+
+ sed -e '/@echo CC/d' \
+ -e 's|@${CC}|$(CC)|g' \
+ -i Makefile || die
+
+ restore_config config.def.h
+
+ tc-export CC
+
+ default
+}
+
+src_test() {
+ ./testsuite.sh || die
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README.md
+ doman ${PN}.1
+
+ save_config config.def.h
+}
diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
new file mode 100644
index 000000000000..b5007ff63a3f
--- /dev/null
+++ b/app-misc/abduco/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>hendrik@consetetur.de</email>
+ <name>Hendrik v. Raven (lorem_ipsum)</name>
+</maintainer>
+<maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+ abduco provides session management i.e. it allows programs to be run independently from its controlling terminal. That is programs can be detached - run in the background - and then later reattached. Together with dvtm it provides a simpler and cleaner alternative to tmux or screen.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/abook-0.6.1 b/app-misc/abook-0.6.1
deleted file mode 100644
index 95e48fe50ffd..000000000000
--- a/app-misc/abook-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt mail client
-EAPI=5
-HOMEPAGE=http://abook.sourceforge.net/
-IUSE=nls
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline dev-libs/libvformat nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5081824a2a61b546533a081a38a10b20
diff --git a/app-misc/abook-0.6.1-r1 b/app-misc/abook-0.6.1-r1
deleted file mode 100644
index 0cf7de96ae15..000000000000
--- a/app-misc/abook-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt mail client
-EAPI=6
-HOMEPAGE=http://abook.sourceforge.net/
-IUSE=nls
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline dev-libs/libvformat nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c4ff4da8b196080de5736492ef9f8774
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
new file mode 100644
index 000000000000..65c9312255a9
--- /dev/null
+++ b/app-misc/abook/Manifest
@@ -0,0 +1,5 @@
+AUX abook-0.6.1-tinfo.patch 531 BLAKE2B 8acbb9fc21f2e78c508a1daa481d626501f12d22bf815b2663415d624a1a5e31e378cf6a741bd2a310898dbe6c18fa88137df238b760b0d5aebaa4f695cfc1a6 SHA512 1e0b7e3c2134e39b2fcece60a3c31927a6c4bd1049c9f14b1ed3426111efe035a433878dcd965bf1a3756daba75ebdf6983c0cd777bb4b1a92e62199a16f10a1
+DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
+EBUILD abook-0.6.1-r1.ebuild 943 BLAKE2B ac67f194aaff7772d4457da67f5068514fd8801e6e891e427e569659c36d716b5fdf708361f4178f2ea6794808c17ab6789982e4a04946c1d440664d26d165f6 SHA512 50aaabde17ba2d54718fe219fbe8b87d7feb9db3a84d2195be7dd847302dbf68b408df5affcd6c1e264fcefd0f904b0db666f514500c3ae7d5b5fbf4bad0af78
+EBUILD abook-0.6.1.ebuild 961 BLAKE2B b9c6b2f4019cfaeef68af15c009553e5c874f9fa460059ea0a9bad6d0edeffdf5f5c2ef239542135848e9a958d5d9183f8696c43d67d0cdd5875bfab3f24115e SHA512 e79e18762afecda642e07011ab4cb2cdc9ff52903b28648b77a8fbf5abb86f0779fda94ab5a08b1e1c471956b42abf4a074bbfb006268ff1e282a1418ce0c907
+MISC metadata.xml 423 BLAKE2B 4ab53b2240a614737a3a9b3b377b1e342a7d61927947a7990919ca5ec03fb3c40c8bde39fb878abb27a00d7c94c65279e0892d4f121f045333fc8ae6b3af910d SHA512 1c7a4d398dcf82207508d4d05eac280df7561abe860a67b673b52ff9be46faabfed38a80c6224f712a8a8c73a04f9b68be33d3d128a5f58a5e9441e2f93abea8
diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..37e0289c6c32
--- /dev/null
+++ b/app-misc/abook/abook-0.6.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${P/_/}"
+DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
+HOMEPAGE="http://abook.sourceforge.net/"
+SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+ sys-libs/ncurses
+ sys-libs/readline
+ dev-libs/libvformat
+ nls? ( virtual/libintl )"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.1-tinfo.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-curses \
+ --with-readline \
+ --enable-vformat \
+ $(use_enable nls)
+}
+
+src_compile() {
+ # bug 570428
+ emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/abook/abook-0.6.1.ebuild b/app-misc/abook/abook-0.6.1.ebuild
new file mode 100644
index 000000000000..63f75d43f870
--- /dev/null
+++ b/app-misc/abook/abook-0.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools
+
+MY_P="${P/_/}"
+DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
+HOMEPAGE="http://abook.sourceforge.net/"
+SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND="sys-libs/ncurses
+ sys-libs/readline
+ dev-libs/libvformat
+ nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # TODO: do the right thing and find out whats wrong with Makefile.in
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-curses \
+ --with-readline \
+ --enable-vformat \
+ $(use_enable nls)
+}
+
+src_compile() {
+ # bug 570428
+ emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc BUGS ChangeLog FAQ README TODO sample.abookrc
+}
diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch
new file mode 100644
index 000000000000..e8c4585dbcb4
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,7 @@
+
+ AC_CHECK_LIB(ncursesw, initscr,
+ [LIBS="$LIBS -lncursesw"
++ AC_SEARCH_LIBS(cbreak, tinfo)
+ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+ fi
+@@ -93,6 +94,7 @@
+ ac_widec_possible=no
+ AC_CHECK_LIB(ncurses, initscr,
+ [LIBS="$LIBS -lncurses"
++ AC_SEARCH_LIBS(cbreak, tinfo)
+ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ fi
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
new file mode 100644
index 000000000000..6a92d05f0ab5
--- /dev/null
+++ b/app-misc/abook/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
+ <longdescription>abook is a text-based addressbook program for the mutt mail client.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">abook</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/acdctl-1.1 b/app-misc/acdctl-1.1
deleted file mode 100644
index e3b67d7a2549..000000000000
--- a/app-misc/acdctl-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/libusb:0
-DESCRIPTION=Apple Cinema Display Control
-EAPI=4
-HOMEPAGE=https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/
-KEYWORDS=ppc
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0
-SLOT=0
-SRC_URI=http://www.technocage.com/~caskey/acdctl/download/acdctl-1.1.tar.bz2
-_md5_=d4c727124b43e8f62d9155e05b808024
diff --git a/app-misc/acdctl-1.1-r1 b/app-misc/acdctl-1.1-r1
deleted file mode 100644
index cbaa35b80312..000000000000
--- a/app-misc/acdctl-1.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/libusb:0
-DESCRIPTION=Apple Cinema Display Control
-EAPI=6
-HOMEPAGE=https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/
-KEYWORDS=ppc
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0
-SLOT=0
-SRC_URI=http://www.technocage.com/~caskey/acdctl/download/acdctl-1.1.tar.bz2
-_md5_=a7c1b21a717baabc3848a76d71405737
diff --git a/app-misc/acdctl/Manifest b/app-misc/acdctl/Manifest
new file mode 100644
index 000000000000..f6563a833b08
--- /dev/null
+++ b/app-misc/acdctl/Manifest
@@ -0,0 +1,4 @@
+DIST acdctl-1.1.tar.bz2 10827 BLAKE2B d52f1df87844ecfd5fe361b43d20ddef9d10b1f53cbd692540a869e1f26974abd8e758167d781ce8ebdc17cb09548ae9aeb4ebe4553bb55a2fd14280874127bb SHA512 3a41aba7b6385f4d823694bfd387036759b7d47355f2d69e92de9e80bb9491aeaf5e060cf6695ae5ec23ba7580e203c13210b7d2bc5aaf796adf52925557043d
+EBUILD acdctl-1.1-r1.ebuild 464 BLAKE2B 802d011aecd6337bdba2971e0599ec11cbdee5a4c5c0046f5232f3360fe43810b1e8e607358adf39f79e0350fe64a34469bc4f7f2483c1aa177be70f3cf531fb SHA512 666cd76bdbcb7cd6215f352bf4473ee2b4f839c1de47ac146cca5795ff9f4fcd378a7e47ba900b7966ae58d341c4c72c7d72d60e8f3a03656b14831049f33ed4
+EBUILD acdctl-1.1.ebuild 481 BLAKE2B 19d0783b6e3bb33f86922e0bbb4e59dd033f1f047a6656dbb938372483bb2eb8c685fdcbbb74d06e2627f064788ba55c54374d2b344526fddaeab9e52c81047e SHA512 40957c72e6d3a0543a0dfaf84966f6d48fb050b037c5e17dc792a8d25a66170005cb3d7143ac018cf6b107bd7386b587ec097d47c336451727fc40b7f69d000f
+MISC metadata.xml 373 BLAKE2B 46b320638ecd40790e2270ead4ec1dda08b8f4b9040dba3587ff41b6d98693569115c369b266578e188911b3baa39c3bd704617c576edc0dfc686724e844d6cc SHA512 67c365f43ba3e1afc711315248dfec34e462e719e7ceb799e343c5ca15e189683f52553e3bfdce9c438d4d7b2cbcac84b56f17d5c3665e301f58ef3530286272
diff --git a/app-misc/acdctl/acdctl-1.1-r1.ebuild b/app-misc/acdctl/acdctl-1.1-r1.ebuild
new file mode 100644
index 000000000000..bde44c11ce75
--- /dev/null
+++ b/app-misc/acdctl/acdctl-1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Apple Cinema Display Control"
+HOMEPAGE="https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/"
+SRC_URI="http://www.technocage.com/~caskey/acdctl/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc"
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ einstalldocs
+ dobin "${PN}"
+}
diff --git a/app-misc/acdctl/acdctl-1.1.ebuild b/app-misc/acdctl/acdctl-1.1.ebuild
new file mode 100644
index 000000000000..7d3a8413cd8a
--- /dev/null
+++ b/app-misc/acdctl/acdctl-1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Apple Cinema Display Control"
+HOMEPAGE="https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/"
+SRC_URI="http://www.technocage.com/~caskey/acdctl/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc"
+IUSE=""
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ dobin acdctl
+ dodoc CHANGELOG README
+}
diff --git a/app-misc/acdctl/metadata.xml b/app-misc/acdctl/metadata.xml
new file mode 100644
index 000000000000..7c59a4536f13
--- /dev/null
+++ b/app-misc/acdctl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ acdctl is a command-line utility to control the otherwise inaccessible
+ brightness levels of an Apple Cinema Display on any system with libusb
+ support.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/actkbd-0.2.8-r2 b/app-misc/actkbd-0.2.8-r2
deleted file mode 100644
index e8c1cd63a6c0..000000000000
--- a/app-misc/actkbd-0.2.8-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DESCRIPTION=A keyboard shortcut daemon
-EAPI=5
-HOMEPAGE=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/
-IUSE=kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-0.2.8.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=479d3fb46f1b83f33d7b60050bdc34cb
diff --git a/app-misc/actkbd/Manifest b/app-misc/actkbd/Manifest
new file mode 100644
index 000000000000..e8726d6ec790
--- /dev/null
+++ b/app-misc/actkbd/Manifest
@@ -0,0 +1,6 @@
+AUX actkbd-0.2.7-amd64.patch 1188 BLAKE2B b9dc0dac0241038a70e1bb4c3e7b0105326bd18bb5c3af55221a039879eb0cf8171b8ebe6b6819dc25bbd51476fd012d9db2f21ff0ad34580366df60f3c5bbd8 SHA512 921b5f654aabe06eb0589cf1b22bf44e3c7c662b088104dff8d439929ffa05fc6f658619bc54f5b0fa813a396ae740f05a121515af8f546395250a55a722dab0
+AUX actkbd.confd 276 BLAKE2B d06f7e45cbe94b042384186b2b47b69e2e657e2a9b5845d2427b8bfe0c09d2c319e53c78e6576b8b6dbbba8dd60325c2e92e6e88d5cd231cffda38b075d795ae SHA512 2128c4c3e1754014e7e1e446ce6d8753045d517c500a957ceb0e761d60c0141c6fc26f427891d2937c5cb56c60759b9045ba21418d2f57bd8dca11c10ade18bf
+AUX actkbd.initd 782 BLAKE2B a5c95e50da4c0ecd20ddd6d1426b19a8ea47e1b1495d7b5cf8e61bb8d26072acf2d07aacc4714b1b000ba63c1233c9d007ab32d5c4e12b7ea323d2e0d078f8a2 SHA512 1d5d0e62a09562d7274807f18d8a34735b4ddb47bc2cb99374a8b62ffef8d5e553a682e273b57ef99460b1850730520e9f12b1ffeab8c39ddaec50595e100b8e
+DIST actkbd-0.2.8.tar.bz2 23192 BLAKE2B dd756023de258f95354d91b521343311648937af82f65fa03748a2924711ae6d1a78cb58be44b0fe01fa5d706bcc575e68afa2663798fa776a1af3dedbc81974 SHA512 307d97b2854be801f1a4a8a8fbc408d3c83efd40f5bb35ea463b154fc0c9761fcb83a99905cd2730a24122ff222f60f31c4ac0163600ba463d4713846de2bf72
+EBUILD actkbd-0.2.8-r2.ebuild 1197 BLAKE2B ee60d4cc240d951d8a573e01666266064ad9cd8645ebd3175a52843af3bc080d25e6e838b2948416e8ea484208824af001e9325e17574408d54133f8fbb5dad4 SHA512 3971370b2d2b9cafb4d9570ef65a233fa392a95d8378429dacc57f78e1f89fc8aab8413466d163fce84d071929f219abb0ae886e7cfa20071113171fc982f0c1
+MISC metadata.xml 351 BLAKE2B 9dcf03875f2de0000bb108421dc815047ffdf17244bacbb7ec36e5186a4e65cc19f1d2bce281867034c12dff082c4402039e00f863d29012618f799481e24dc9 SHA512 f40d5dc16d267d0bf0171d927157805a4b31a3e2816eb128d3b9e6f0aded5b45b1865c1e06ceccf56618f68a15682fc3f416e7af49af007073b50fdb383359cd
diff --git a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
new file mode 100644
index 000000000000..0b926c6873fa
--- /dev/null
+++ b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info eutils toolchain-funcs
+
+DESCRIPTION="A keyboard shortcut daemon"
+HOMEPAGE="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"
+SRC_URI="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+CONFIG_CHECK="~INPUT_EVDEV"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.2.7-amd64.patch
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin actkbd
+ dodoc AUTHORS ChangeLog FAQ README TODO
+ docinto samples
+ dodoc samples/actkbd.conf
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
+
+pkg_postinst() {
+ elog
+ elog "System-wide configuration file is /etc/actkbd.conf."
+ elog "Use actkbd.conf from usr/share/doc/${PF}/samples as a template."
+ elog "You need to create the config and set right input device from"
+ elog "/dev/input/event* in /etc/conf.d/actkbd"
+ elog
+ elog "To obtain keycodes for pressed combinations/keys just run:"
+ elog " # actkbd -s -d /dev/input/event<MYDEVICENUMBER>"
+}
diff --git a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
new file mode 100644
index 000000000000..b962d7e861a7
--- /dev/null
+++ b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
@@ -0,0 +1,38 @@
+# Try to fix pointer assigned to int and vice-versa problems. Written by Joe Pelkey.
+
+diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h
+--- actkbd-0.2.7.orig/actkbd.h 2006-05-02 13:24:01.000000000 -0400
++++ actkbd-0.2.7/actkbd.h 2006-10-27 03:37:37.000000000 -0400
+@@ -122,7 +122,7 @@
+ typedef struct _attr_t attr_t;
+ struct _attr_t {
+ int type; /* Attribute type */
+- void *opt; /* Options for this attribute */
++ int opt; /* Options for this attribute */
+ attr_t *next; /* The next node */
+ };
+
+diff -ru actkbd-0.2.7.orig/config.c actkbd-0.2.7/config.c
+--- actkbd-0.2.7.orig/config.c 2006-08-20 07:05:36.000000000 -0400
++++ actkbd-0.2.7/config.c 2006-10-27 03:55:21.000000000 -0400
+@@ -107,7 +107,7 @@
+ strtolower(attrs);
+ while ((tmp = strsep(&attrs, ", \t")) != NULL) {
+ int type = -1;
+- void *opt = NULL;
++ int opt = 0;
+ char *num = NULL;
+
+ if (strlen(tmp) == 0)
+@@ -174,9 +174,9 @@
+
+ errno = 0;
+ if (strlen(num) > 0) {
+- opt = (void *)((int)strtol(num, (char **)NULL, 10));
++ opt = ((int)strtol(num, (char **)NULL, 10));
+ } else {
+- opt = (void *)((int)(-1));
++ opt = ((int)(-1));
+ }
+
+ if (((int)opt < 0) &&
diff --git a/app-misc/actkbd/files/actkbd.confd b/app-misc/actkbd/files/actkbd.confd
new file mode 100644
index 000000000000..5c67b5151717
--- /dev/null
+++ b/app-misc/actkbd/files/actkbd.confd
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Configuration file
+CONFIG="/etc/actkbd.conf"
+
+# Event provider providing the keypress events
+EVENT_DEVICE="/dev/input/<DEVICE>"
+
+# PID
+PIDFILE="/var/run/actkbd.pid"
+
diff --git a/app-misc/actkbd/files/actkbd.initd b/app-misc/actkbd/files/actkbd.initd
new file mode 100644
index 000000000000..bb03870adb2f
--- /dev/null
+++ b/app-misc/actkbd/files/actkbd.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+checkconfig() {
+ if [ ! -f ${CONFIG} ] ; then
+ eerror "Config file \"${CONFIG}\" does not exist. Create it prior launching the daemon."
+ return 1
+ fi
+ if [ ! -c ${EVENT_DEVICE} ] ; then
+ eerror "Device \"${EVENT_DEVICE}\" is not valid pointer to input provider."
+ return 1
+ fi
+}
+
+depend() {
+ before acpid
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting actkbd"
+ start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec /usr/bin/actkbd -- -c "${CONFIG}" -D -q -x -l -p "${PIDFILE}" -d "${EVENT_DEVICE}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping actkbd"
+ start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --exec /usr/bin/actkbd
+ eend $?
+}
diff --git a/app-misc/actkbd/metadata.xml b/app-misc/actkbd/metadata.xml
new file mode 100644
index 000000000000..80d57fa74097
--- /dev/null
+++ b/app-misc/actkbd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription>
+actkbd is a simple daemon that binds actions to keyboard events. It recognises
+key combinations and can handle press, repeat and release events.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/aldo-0.7.7 b/app-misc/aldo-0.7.7
deleted file mode 100644
index 60da8acc6598..000000000000
--- a/app-misc/aldo-0.7.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=>=media-libs/libao-0.8.5
-DESCRIPTION=A morse tutor
-EAPI=5
-HOMEPAGE=https://www.nongnu.org/aldo/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libao-0.8.5
-SLOT=0
-SRC_URI=mirror://nongnu/aldo/aldo-0.7.7.tar.bz2
-_md5_=48772a6b8de4f9fcb7f64c90ef58f3ed
diff --git a/app-misc/aldo/Manifest b/app-misc/aldo/Manifest
new file mode 100644
index 000000000000..9592acfa624b
--- /dev/null
+++ b/app-misc/aldo/Manifest
@@ -0,0 +1,3 @@
+DIST aldo-0.7.7.tar.bz2 112000 BLAKE2B fec22761f49bccc91f47a224576f1a0faffcb9680826872470392a7c4ebe5018691fcd031462ebe220239e6384a46366fd7611ea10efe20216477bdd102c6693 SHA512 b68f9bd96210f17b6a37bc49f114bba70b75357967580cb4644454789b70285439f15bedb55fb93aa1bc0e5027c46a65679fcefb6a66332ca37d866d9c169e0b
+EBUILD aldo-0.7.7.ebuild 441 BLAKE2B 5d8133de4e4df6f4d15355e4ba874f7154a56426a9d80f81789df8309ae48e84583a92773b470b0e10947b93ea0b3ae5ef00771596d4c28aa1c19cbc4dfcc23d SHA512 7a1b00464559b42c632d05dc74e176f17763cbb73541c41d0331fba7b089c5b77a2b418dfdf186ed91c88ec7f9f3ec385c77be66030201bb9d9535ee165f68ca
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/aldo/aldo-0.7.7.ebuild b/app-misc/aldo/aldo-0.7.7.ebuild
new file mode 100644
index 000000000000..d4a4f66971ce
--- /dev/null
+++ b/app-misc/aldo/aldo-0.7.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A morse tutor"
+HOMEPAGE="https://www.nongnu.org/aldo/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libao-0.8.5"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}"
+}
diff --git a/app-misc/aldo/metadata.xml b/app-misc/aldo/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/aldo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/anki-2.1.0_beta25 b/app-misc/anki-2.1.0_beta25
deleted file mode 100644
index ee8d3d99ae28..000000000000
--- a/app-misc/anki-2.1.0_beta25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=6
-HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound test python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python3_6
-SLOT=0
-SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta25-source.tgz -> anki-2.1.0_beta25.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f065a4d27f75db9e0c5f3509c6b2db56
diff --git a/app-misc/anki-2.1.0_beta27 b/app-misc/anki-2.1.0_beta27
deleted file mode 100644
index 6a2793ef7835..000000000000
--- a/app-misc/anki-2.1.0_beta27
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=6
-HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound test python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python3_6
-SLOT=0
-SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta27-source.tgz -> anki-2.1.0_beta27.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c0ad7a51a4a575350b921486e06f48d
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
new file mode 100644
index 000000000000..2bd542fb570f
--- /dev/null
+++ b/app-misc/anki/Manifest
@@ -0,0 +1,6 @@
+AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
+DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8
+DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
+EBUILD anki-2.1.0_beta25.ebuild 1881 BLAKE2B ff530eefc984bd972004a51c5b958102e31ace78ce8042b567311e8a79ed65b44ed901c675f58b7a386400a1bb3beee6dffe9ecc598ced33d10afd6fb7ce565c SHA512 8faab45dd5c2def4a01083669569f4389f975ed43359b072b24f62e80f32009de34b6b6c5939998f829d4f90d47eb6be310e589f2410b038f7cf7d40bbdf121a
+EBUILD anki-2.1.0_beta27.ebuild 1917 BLAKE2B 1b1d8b08965e44ec4dd6c6afa20e5c36f215cfa764fff1c1b950fcf54f7b0daad63bddd8c9f2d416567ab504c1cbe1d12521eea17616da1e53fe5e0a9ef546d7 SHA512 3c8e2f3056028d8de9cb6ad2510c9838fc2450e0b992dfaee69fc40fa60ad8a16eebb30c0ccb573a66a33b506475239482b5bf2598c2b881e2e1a52dadf9d81d
+MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
new file mode 100644
index 000000000000..71268203040c
--- /dev/null
+++ b/app-misc/anki/anki-2.1.0_beta25.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 xdg
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net"
+
+MY_P="${P/_/}"
+SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="latex +recording +sound test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/send2trash[${PYTHON_USEDEP}]
+ recording? (
+ media-sound/lame
+ >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
+ )
+ sound? ( media-video/mplayer )
+ latex? (
+ app-text/texlive
+ app-text/dvipng
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-web-folder.patch )
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/updates=True/updates=False/" \
+ aqt/profiles.py || die
+}
+
+src_compile() {
+ :;
+}
+
+src_test() {
+ sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
+ -i tools/tests.sh || die
+ ./tools/tests.sh || die
+}
+
+src_install() {
+ cp tools/runanki.system tools/anki
+ doicon ${PN}.png
+ domenu ${PN}.desktop
+ doman ${PN}.1
+
+ dodoc README.md README.development
+ python_domodule aqt anki
+ python_doscript tools/anki
+
+ # Localization files go into the anki directory:
+ python_moduleinto anki
+ python_domodule locale
+
+ # not sure if this is correct, but
+ # site-packages/aqt/mediasrv.py wants the directory
+ insinto /usr/share/anki
+ doins -r web
+}
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
new file mode 100644
index 000000000000..a4c33685fa1e
--- /dev/null
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 xdg
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net"
+
+MY_P="${P/_/}"
+SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/PyQt5[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/send2trash[${PYTHON_USEDEP}]
+ recording? (
+ media-sound/lame
+ >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
+ )
+ sound? ( media-video/mplayer )
+ latex? (
+ app-text/texlive
+ app-text/dvipng
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/updates=True/updates=False/" \
+ aqt/profiles.py || die
+}
+
+src_compile() {
+ :;
+}
+
+src_test() {
+ sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
+ -i tools/tests.sh || die
+ ./tools/tests.sh || die
+}
+
+src_install() {
+ cp tools/runanki.system tools/anki
+ doicon ${PN}.png
+ domenu ${PN}.desktop
+ doman ${PN}.1
+
+ dodoc README.md README.development
+ python_domodule aqt anki
+ python_doscript tools/anki
+
+ # Localization files go into the anki directory:
+ python_moduleinto anki
+ python_domodule locale
+
+ # not sure if this is correct, but
+ # site-packages/aqt/mediasrv.py wants the directory
+ insinto /usr/share/anki
+ doins -r web
+}
diff --git a/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch
new file mode 100644
index 000000000000..19b196c4ace7
--- /dev/null
+++ b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch
@@ -0,0 +1,11 @@
+--- anki-2.1.0beta25/aqt/mediasrv.py
++++ anki-2.1.0beta25/aqt/mediasrv.py
+@@ -13,7 +13,7 @@
+ # locate web folder in source/binary distribution
+ def _getExportFolder():
+ # running from source?
+- srcFolder = os.path.join(os.path.dirname(__file__), "..")
++ srcFolder = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share", "anki")
+ webInSrcFolder = os.path.abspath(os.path.join(srcFolder, "web"))
+ if os.path.exists(webInSrcFolder):
+ return webInSrcFolder
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
new file mode 100644
index 000000000000..b4fe64e7501a
--- /dev/null
+++ b/app-misc/anki/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <longdescription lang="en">
+ Anki is a program designed to help you remember facts
+ (such as words and phrases in a foreign language) as
+ quickly, easily and efficiently as possible.
+ </longdescription>
+ <use>
+ <flag name="recording">
+ Enable support for audio recording
+ </flag>
+ <flag name="sound">
+ Enable support for adding sound to cards
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/asciinema-2.0.1 b/app-misc/asciinema-2.0.1
deleted file mode 100644
index 5a5fdb874ee6..000000000000
--- a/app-misc/asciinema-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Command line recorder for asciinema.org service
-EAPI=6
-HOMEPAGE=https://asciinema.org/ https://pypi.org/project/asciinema/
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/asciinema/asciinema/archive/v2.0.1.tar.gz -> asciinema-2.0.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be0075e41d16b4a90f87c2c43f1a1f8c
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
new file mode 100644
index 000000000000..dd8d16b8e1c6
--- /dev/null
+++ b/app-misc/asciinema/Manifest
@@ -0,0 +1,3 @@
+DIST asciinema-2.0.1.tar.gz 48597 BLAKE2B 9179d19c3c6980f35004145fc109dfa938fa020e1982389f7309c7716f8e18914fb8db46e74b2d778b043399d00a3348e499e9fc1849f5f02e1a729c8bde6084 SHA512 abc7e2a83032520d42b45524fbd103bd974b6857274fbb923b274d11f0a81a8d06cd1e97f1b7d6432a47e1ded6df5e37e52c69caaf7f15b1bf8b53f17dfc07d1
+EBUILD asciinema-2.0.1.ebuild 710 BLAKE2B 21c5751c17fec390c63f2b49e3eb8452f3a5ddc2a6c44f4bcab01e10a281577c19578671a962fb469589e38be29a8701de83b72fc826f77b223040b0d3f6b559 SHA512 9760b1c7b22686a50dc1eef4ae47bf670981eb8269628935f12f58739079fb8ab3bd95ffa1fb0c1b4f3a317b62faa14a8b3a4b1fc0454fb71947b7768cc09897
+MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.1.ebuild b/app-misc/asciinema/asciinema-2.0.1.ebuild
new file mode 100644
index 000000000000..67995e5b2efd
--- /dev/null
+++ b/app-misc/asciinema/asciinema-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Command line recorder for asciinema.org service"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md doc/asciicast-v1.md )
+
+python_test() {
+ nosetests || die
+}
+
+src_install() {
+ distutils-r1_src_install
+ doman man/asciinema.1
+}
diff --git a/app-misc/asciinema/metadata.xml b/app-misc/asciinema/metadata.xml
new file mode 100644
index 000000000000..fa9c8379fce5
--- /dev/null
+++ b/app-misc/asciinema/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>kensington@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">asciinema/asciinema</remote-id>
+ <remote-id type="pypi">asciinema</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/astrolog-5.40-r3 b/app-misc/astrolog-5.40-r3
deleted file mode 100644
index 5b522223e205..000000000000
--- a/app-misc/astrolog-5.40-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 )
-DESCRIPTION=A many featured astrology chart calculation program
-EAPI=6
-HOMEPAGE=http://www.astrolog.org/astrolog.htm
-IUSE=X
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=astrolog
-RDEPEND=X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=http://www.astrolog.org/ftp/ast54unx.shr
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7f220666147fc29b69eab88011b879a3
diff --git a/app-misc/astrolog-ephemeris-5.40 b/app-misc/astrolog-ephemeris-5.40
deleted file mode 100644
index e39499d6b88b..000000000000
--- a/app-misc/astrolog-ephemeris-5.40
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/astrolog app-arch/unzip
-DESCRIPTION=ephemeris files for optional extended accuracy of astrolog's calculations
-EAPI=0
-HOMEPAGE=http://www.astrolog.org/astrolog.htm
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=astrolog
-RDEPEND=app-misc/astrolog
-SLOT=0
-SRC_URI=http://www.astrolog.org/ftp/ephem/ephemall.zip
-_md5_=78350304d625975a59482becc644d3e0
diff --git a/app-misc/astrolog-ephemeris/Manifest b/app-misc/astrolog-ephemeris/Manifest
new file mode 100644
index 000000000000..31b6833c6fca
--- /dev/null
+++ b/app-misc/astrolog-ephemeris/Manifest
@@ -0,0 +1,3 @@
+DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
+EBUILD astrolog-ephemeris-5.40.ebuild 619 BLAKE2B 6f2b34f72179f26c2c36a4296a9f78e3a7a570339deb0e3b6025a3dcf623910034845201d98a4b02e5f5a4bad71babfd75ed672e9b4061effce7ac1eb0eab889 SHA512 99c8c27eafe99574565ece5935c4982d0e1014c575167c04eb8f98600135aa5911dadbea62d189b7a0912eafa43095c5103661308a7b98c968e7966e785536b6
+MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
new file mode 100644
index 000000000000..0e79b4d13905
--- /dev/null
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
+HOMEPAGE="http://www.astrolog.org/astrolog.htm"
+SRC_URI="http://www.astrolog.org/ftp/ephem/ephemall.zip"
+
+LICENSE="astrolog"
+SLOT="0"
+# works fine on x86 - runs probably on other architectures, too
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+RDEPEND="app-misc/astrolog"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+src_install() {
+ dodir /usr/share/astrolog
+ cp * "${D}"/usr/share/astrolog || die "cp failed"
+}
diff --git a/app-misc/astrolog-ephemeris/metadata.xml b/app-misc/astrolog-ephemeris/metadata.xml
new file mode 100644
index 000000000000..0c6991d7902b
--- /dev/null
+++ b/app-misc/astrolog-ephemeris/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
new file mode 100644
index 000000000000..12babe4c7bc1
--- /dev/null
+++ b/app-misc/astrolog/Manifest
@@ -0,0 +1,3 @@
+DIST ast54unx.shr 1465432 BLAKE2B 9eec58fb66110a7fd072eee8b02dda109a22c1a1d59506943011041ab595e33eac39f5372ab55f587bcdfb447e599b16b8a9f0ccd04c54257b0dd38a85acde08 SHA512 824fcea1891dafc77692e84a36cc97a8afd90ad93d772edab8437e89869cdc912002f628fd86eecc8182ba4f1ad02cb98f42a30fde425bf94cf59f852b4eda1a
+EBUILD astrolog-5.40-r3.ebuild 2124 BLAKE2B 4d14b95dbbd64b513c95de7b9999d9706d7d59b73a54207e6768b0c49a1d468bc0c118d062936fba3132ff63dfb032819cd7acedbfa687af23875a2ec686fffa SHA512 5f24d1d927d3a18d6e8ae080135b9f6ef7a8093ebb3ba8eb1a4b6e7d3ec5e2c1bd74342c157cda7deab15733ed9c82a7837d1bbf545adc2c327cdaf36e4a052b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/astrolog/astrolog-5.40-r3.ebuild b/app-misc/astrolog/astrolog-5.40-r3.ebuild
new file mode 100644
index 000000000000..04fdcd95eae3
--- /dev/null
+++ b/app-misc/astrolog/astrolog-5.40-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A many featured astrology chart calculation program"
+HOMEPAGE="http://www.astrolog.org/astrolog.htm"
+SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
+
+LICENSE="astrolog"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ sh "${DISTDIR}"/ast54unx.shr || die
+}
+
+src_prepare() {
+ default
+
+ # remove stripping of created binary, dump hardcoded CFLAGS,
+ # respect CC (bug #243606), and CFLAGS (bug #240057)
+ sed \
+ -e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
+ -e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
+ -i Makefile || die
+
+ # we use /usr/share/astrolog for config and (optional) ephemeris-data-files
+ sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
+
+ # if we use X, we need to add -L/usr/X11R6/lib to compile succesful
+ #use X && sed -i -e "s:-lm -lX11:-lm -lX11 -L/usr/X11R6/lib:g" Makefile
+
+ # if we do NOT use X, we disable it by removing the -lX11 from the Makefile
+ # and remove the "#define X11" and "#define MOUSE" from astrolog.h
+ use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile || die
+ sed -i -e "s:#define X11:/*#define X11:g" astrolog.h || die
+ sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h || die)
+
+ # any user may have an own astrolog configfile
+ #sed -i -e "s:astrolog.dat:astrolog.dat:g" astrolog.h || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin astrolog
+ dodoc Helpfile.540 README.1ST README.540 Update.540
+ insinto /usr/share/astrolog
+ doins astrolog.dat
+}
+
+pkg_postinst() {
+ elog "There is a sample config file /usr/share/astrolog/astrolog.dat"
+ elog "astrolog looks in current dir for a file astrolog.dat before"
+ elog "using the file in /usr/share/astrolog"
+ elog "If you want extended accuracy of astrolog's calculations you"
+ elog "can emerge the optional package \"astrolog-ephemeris\" which"
+ elog "needs ~4.7 MB additional diskspace for the ephemeris-files"
+}
diff --git a/app-misc/astrolog/metadata.xml b/app-misc/astrolog/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/astrolog/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/away-0.9.5-r2 b/app-misc/away-0.9.5-r2
deleted file mode 100644
index 23aa3ad1cce6..000000000000
--- a/app-misc/away-0.9.5-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/pam-0.75
-DESCRIPTION=Terminal locking program with few additional features
-EAPI=6
-HOMEPAGE=http://unbeatenpath.net/software/away/
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/pam-0.75
-SLOT=0
-SRC_URI=mirror://gentoo/away-0.9.5.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9b301d846ba43ca2d8e8a5ada429a19
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
new file mode 100644
index 000000000000..2a4ef561993a
--- /dev/null
+++ b/app-misc/away/Manifest
@@ -0,0 +1,3 @@
+DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
+EBUILD away-0.9.5-r2.ebuild 785 BLAKE2B e515a7767185ff96de05b4e9aef5b014dc9e74d9c71977ae8f3f2b68cc1b1de300c3256da923af91979dd3b64c85c62f4f074012094caf60cc3a0469bb123df5 SHA512 c17b180d59c151d307ced058f3d5d13966c828c6bbe75a46cffa92f6bbfe4cbb8a9fa2f99d2ff9f0f428d6a5a1245c1df187b726fc7a932020e06a931b7788d7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..daf7c44d333d
--- /dev/null
+++ b/app-misc/away/away-0.9.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam toolchain-funcs flag-o-matic
+
+DESCRIPTION="Terminal locking program with few additional features"
+HOMEPAGE="http://unbeatenpath.net/software/away/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+RDEPEND=">=sys-libs/pam-0.75"
+DEPEND="${RDEPEND}"
+
+DOCS=( BUGS AUTHORS NEWS README TODO data/awayrc )
+src_prepare() {
+ default
+ sed -i -e '/-o \$(BINARY)/d' \
+ -e 's:LIBS:LDLIBS:' \
+ "${S}"/Makefile || die "Makefile fix failed"
+
+}
+
+src_compile() {
+ append-flags -pthread
+
+ emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin away
+ doman doc/*
+ einstalldocs
+ pamd_mimic_system away auth
+}
diff --git a/app-misc/away/metadata.xml b/app-misc/away/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/away/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/banner-1.3.3 b/app-misc/banner-1.3.3
deleted file mode 100644
index 2c62ea5e5e18..000000000000
--- a/app-misc/banner-1.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!games-misc/bsd-games
-DESCRIPTION=The well known banner program for Linux
-EAPI=5
-HOMEPAGE=http://cedar-solutions.com
-KEYWORDS=alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b30f638d19bcb8c5b5111a8fa327d4f
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
new file mode 100644
index 000000000000..4ccc9a52f7ef
--- /dev/null
+++ b/app-misc/banner/Manifest
@@ -0,0 +1,4 @@
+AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa4207c5d136a8558da37f5fd51113a5884a900584f13c98200471aea2e7ecaf61e97efbb63d244c31ecc1fa0e8ed SHA512 84fa0555f3fd6c41c3cdf06db92711e9be4c08e32b182ffdcd1385cccdf0d9056a7e3c61431e4a73d660b3314f763ad7e109f0b84105bd555e0c5d60a63746d8
+DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
+EBUILD banner-1.3.3.ebuild 492 BLAKE2B 3bc39ee1df2bf845a929f6ed8c1d1f1841dd02e7ae12a64477c9c3035d572008e61732a5ca8815aaabf9f29ca796ea168ed81cf5467aa24c4d1e91df4d0a9891 SHA512 b25184eae18eb9918ad8873d38a5002d2cf7e9fdaebd1439a6d18014aede27ee87a3598d0a7e5a8a881d437de476f45b4f739013d949d59129b4d54ab476a4f2
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.3.ebuild b/app-misc/banner/banner-1.3.3.ebuild
new file mode 100644
index 000000000000..827111bf412c
--- /dev/null
+++ b/app-misc/banner/banner-1.3.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="The well known banner program for Linux"
+HOMEPAGE="http://cedar-solutions.com"
+SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+DEPEND="!games-misc/bsd-games"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ctype.h.patch
+}
diff --git a/app-misc/banner/files/banner-1.3.3-ctype.h.patch b/app-misc/banner/files/banner-1.3.3-ctype.h.patch
new file mode 100644
index 000000000000..c89e1b3fe8d1
--- /dev/null
+++ b/app-misc/banner/files/banner-1.3.3-ctype.h.patch
@@ -0,0 +1,11 @@
+--- a/banner.c
++++ b/banner.c
+@@ -126,6 +126,8 @@
+ #include <string.h>
+ #endif
+
++#include <ctype.h> /* isspace() toupper() */
++
+ #include "letters.h"
+
+
diff --git a/app-misc/banner/metadata.xml b/app-misc/banner/metadata.xml
new file mode 100644
index 000000000000..2ba8e9e851e4
--- /dev/null
+++ b/app-misc/banner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/bb-1.3.0_rc1-r3 b/app-misc/bb-1.3.0_rc1-r3
deleted file mode 100644
index be2b79aae355..000000000000
--- a/app-misc/bb-1.3.0_rc1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=media-libs/aalib:= dev-libs/lzo:= mikmod? ( media-libs/libmikmod:= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Demonstration program for visual effects of aalib
-EAPI=5
-HOMEPAGE=http://aa-project.sourceforge.net/
-IUSE=mikmod
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/aalib:= dev-libs/lzo:= mikmod? ( media-libs/libmikmod:= )
-SLOT=0
-SRC_URI=mirror://sourceforge/aa-project/bb-1.3rc1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b2c87299a36a77201a12e80dc2c301a
diff --git a/app-misc/bb-1.3.0_rc1-r4 b/app-misc/bb-1.3.0_rc1-r4
deleted file mode 100644
index c21631f7c2f9..000000000000
--- a/app-misc/bb-1.3.0_rc1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=media-libs/aalib:= dev-libs/lzo:= mikmod? ( media-libs/libmikmod:=[openal] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Demonstration program for visual effects of aalib
-EAPI=5
-HOMEPAGE=http://aa-project.sourceforge.net/
-IUSE=mikmod
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/aalib:= dev-libs/lzo:= mikmod? ( media-libs/libmikmod:=[openal] )
-SLOT=0
-SRC_URI=mirror://sourceforge/aa-project/bb-1.3rc1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=41c324bbda3b796f5b58111e3ea3c67d
diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
new file mode 100644
index 000000000000..3639aba3bd3a
--- /dev/null
+++ b/app-misc/bb/Manifest
@@ -0,0 +1,12 @@
+AUX bb-1.3.0_rc1-disable-pulse.patch 803 BLAKE2B a93fa403f76b8edbc3425be071b3a9ee1b8c6c7926f54539fe31ea9348bcf14b145224b1b0e9dd7ec6306ec3ed6ec236c02a2177e08ecd367e6e43fcbe5ffa2e SHA512 97f5255b19ea80c68eaa53aa6c9db55ad5e38e9749db24ba035ab5894cd5f9675dc0bbe695ec78d3e41037d771f669b9cf792feb41c0acc615b53cdf9eefbc1f
+AUX bb-1.3.0_rc1-fix-protos.patch 369 BLAKE2B 97b101ccb06cc8442928e55ef8e7b4acffbb2995eae6671cfa10c6787818a49cc8e3d76ec6a4577b8b49dd807c1ff87446ac792f460242fe1102b2b3e1c81298 SHA512 0f078053b9fed2a20cdd02b606ab7172ac3210f975ee3965a7a8699acd9b8c9a12e1c8119cc916a408db8df5572ce5d1b6d78a1956f055261b74abc4ce9fb960
+AUX bb-1.3.0_rc1-m4-stuff.patch 16358 BLAKE2B 7bac36976a4f024b2cc09011dc10cef4b315299d21356858b85547e3c2d0627a12b7ad4eb56230d065afcb1b255923ea1b9204969b6dcb1db5413534b1ea5c04 SHA512 cfa47a1aa4c602b789c9b6d8fd9b163639971f270c66030a4219b65169ddc83ed5c917665195c6533afb45364ac1d8a45879d341421e9e9c5e8ea44edb57087d
+AUX bb-1.3.0_rc1-messager-overlap.patch 1623 BLAKE2B d62400fa49b2bf57ade223eb14960500391a155cdedbccee7096b7c2688e5f68681bcc5d378099061a534c45d20c43b9e799bcf38af54e4a21326203c42f8508 SHA512 745dd6e5ed1bd1760509183ea4884f575b035165f6c0b9be804dbb28378ed39c899562c75aa1db8e006bff23734181fd5604092adae31de71685b728f78a173b
+AUX bb-1.3.0_rc1-noattr.patch 509 BLAKE2B c13edb1874a0ac334c86f35c76ebc9175e6c965f54a02f62018e322c520da619cdc36f9d69e8dd8d05c71a13232ca38d8901652491d5a20576fa46edd9ceec48 SHA512 e7c4831d8286db8afa0710a11d150e254d6fc738f91d45be6aaeddfcbdf4c530c1cc21091f967d9ba8ef6a399321d6c3ccf194d686a1a77861c72eb60454726c
+AUX bb-1.3.0_rc1-printf-cleanup.patch 2885 BLAKE2B 8e98079763901a468e11344f3f0553d1d335ae5d41a045f75ffe9093bf4bc6b9bc5579bc414fb8013670024cbc5ff3c0bb8bdf74bc77868d79e8b3d63b6ed1bb SHA512 c7181ace0914f9aac7963c473019058fe4d7340337fc19d06ae252bb6bfb2c96b9883915a903f419fb706916796906497c77ad4180d9d861a2a255959b1507de
+AUX bb-1.3.0_rc1-protos.patch 297 BLAKE2B f024f5ddf8567b04fd794c4ac5b9b1cab10ac979d6262657eea8b54ad05d6e1134d4a87251cc2a5fcb9366934772c55755421ee12e87a89a27df9c8ffff35415 SHA512 5e59bb912f1a5187e6a23fc9a66ddbed6e48c12074fd4d74b19fb88bc94aa39b8df27d62cfe8f7856a9e434f2be15261522a4150cb0f92588b53c99e33b853de
+AUX bb-1.3.0_rc1-zbuff-fault.patch 1105 BLAKE2B a6d183c91eb9a9f4c6f0095a6d36fe94931b27daaaf56e04c8b177d2fd77f583e6a267a06894a64b59e05a7749e39ae8bd6898466277b779aa98b1da811e06f6 SHA512 10159f628d993058074d6c97001acad2bc4c71df4331cea2f0d6c1b8bd8c578e230d2cc2e4313457c75252108ab136a1ccc8a626a760fcd4e024b6a370ed1e59
+DIST bb-1.3rc1.tar.gz 1416292 BLAKE2B 342a11002a94f160de23739c5578acf685ff886ae66e182b33cd971b74b258bae6ecd7e9e795f1e6a53a062a4c0ba5296bdbb6f41dd8cca6be4550bb49943023 SHA512 f05eb741f1189038a5a63016437f8eaeb25eb001307561bfe8827701bc246873fec14462e586d5966dcd1c74cddaf346f4670254b712713625e139300817c0a9
+EBUILD bb-1.3.0_rc1-r3.ebuild 1799 BLAKE2B 920436513b8477421a225f68e2e685974f386bad559d7d8c95fef731434650c34e93788012526c61e3d570d58164e1938e0e94e3110485b454379754ec4cb9a6 SHA512 8ea1fe26660536ac59f49d8d7769eaf80e38e12bee8109915700f540c18f215ae779fe8f3825d0c1f19a0164fbcca9cea1170ca11a9ddbbc71fca642b0f264f0
+EBUILD bb-1.3.0_rc1-r4.ebuild 1959 BLAKE2B b011a6ff3f9ea885338d19d8690e875f7de7f74f58b27ed35fb4ce34df59e477f0973efcd46f8e9947aa1c0614eabaef6a18aeda16facb66385484c5487150b4 SHA512 ed6d7a39c2cd45482a0c723eb502b3a59f26a273d2388d3019705f55c03e9a7fc7f82a30a7f4389c09d5a0ca9f5973b3bdaebca97c532e31443620e3ab3dbde2
+MISC metadata.xml 331 BLAKE2B cc3fc6a0098a1ff90cc8805de2c65f68e003a2f707f88567962821295a7a0be3d9e970ea1271f931a46107b034e5dcbd46f254d816525d79f3bac8ee22855082 SHA512 12b5d682065c1178989edc16c08b82bd57833e161e647fa81dfee06a55c2147b5229093196b2157bc8ca421c9fd459ce015fb5dac2de1e35e1ad908d2120e0ed
diff --git a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild b/app-misc/bb/bb-1.3.0_rc1-r3.ebuild
new file mode 100644
index 000000000000..467732903e63
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils versionator
+
+MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
+
+DESCRIPTION="Demonstration program for visual effects of aalib"
+HOMEPAGE="http://aa-project.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mikmod"
+
+DEPEND="media-libs/aalib:=
+ dev-libs/lzo:=
+ mikmod? ( media-libs/libmikmod:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-noattr.patch"
+ epatch "${FILESDIR}/${P}-fix-protos.patch"
+ epatch "${FILESDIR}"/${P}-messager-overlap.patch
+ epatch "${FILESDIR}"/${P}-zbuff-fault.patch
+ epatch "${FILESDIR}"/${P}-printf-cleanup.patch
+ epatch "${FILESDIR}"/${P}-m4-stuff.patch
+
+ # unbundle lzo, #515286
+ rm -v README.LZO minilzo.{c,h} mylzo.h || die
+ sed -e 's/minilzo.c//' \
+ -e 's/minilzo.h//' \
+ -e 's/README.LZO//' \
+ -i Makefile.am || die
+ echo 'bb_LDADD = -llzo2' >> Makefile.am || die
+ # update code
+ sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
+ -e 's,int size = image,lzo_uint size = image,' \
+ -i image.c || die
+
+ # rename binary and manpage bb -> bb-aalib
+
+ mv bb.1 bb-aalib.1 || die
+ sed -e 's/bb/bb-aalib/' \
+ -i bb-aalib.1
+ sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
+ -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/' \
+ -e 's/bb_SOURCES/bb_aalib_SOURCES/' \
+ -e 's/bb_LDADD/bb_aalib_LDADD/' \
+ -i Makefile.am || die
+
+ AT_M4DIR="m4" eautoreconf
+}
+
+pkg_postinst() {
+ elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
+}
diff --git a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
new file mode 100644
index 000000000000..668b4f4df30b
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils versionator
+
+MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
+
+DESCRIPTION="Demonstration program for visual effects of aalib"
+HOMEPAGE="http://aa-project.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mikmod"
+
+DEPEND="media-libs/aalib:=
+ dev-libs/lzo:=
+ mikmod? ( media-libs/libmikmod:=[openal] )
+"
+# media-libs/libmikmod[openal] is due to bug #516964
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-noattr.patch
+ epatch "${FILESDIR}"/${P}-fix-protos.patch
+ epatch "${FILESDIR}"/${P}-messager-overlap.patch
+ epatch "${FILESDIR}"/${P}-zbuff-fault.patch
+ epatch "${FILESDIR}"/${P}-printf-cleanup.patch
+ epatch "${FILESDIR}"/${P}-m4-stuff.patch
+ epatch "${FILESDIR}"/${P}-protos.patch
+ epatch "${FILESDIR}"/${P}-disable-pulse.patch
+
+ # unbundle lzo, #515286
+ rm -v README.LZO minilzo.{c,h} mylzo.h || die
+ sed -e 's/minilzo.c//' \
+ -e 's/minilzo.h//' \
+ -e 's/README.LZO//' \
+ -i Makefile.am || die
+ echo 'bb_LDADD = -llzo2' >> Makefile.am || die
+ # update code
+ sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
+ -e 's,int size = image,lzo_uint size = image,' \
+ -i image.c || die
+
+ # rename binary and manpage bb -> bb-aalib
+
+ mv bb.1 bb-aalib.1 || die
+ sed -e 's/bb/bb-aalib/' \
+ -i bb-aalib.1
+ sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
+ -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/' \
+ -e 's/bb_SOURCES/bb_aalib_SOURCES/' \
+ -e 's/bb_LDADD/bb_aalib_LDADD/' \
+ -i Makefile.am || die
+
+ AT_M4DIR="m4" eautoreconf
+}
+
+pkg_postinst() {
+ elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
+}
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
new file mode 100644
index 000000000000..dcc00c642335
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/516964
+diff --git a/main.c b/main.c
+index c0648b4..a9fac57 100644
+--- a/main.c
++++ b/main.c
+@@ -160,6 +160,17 @@ main (int argc, char *argv[])
+ aa_flush (context);
+ if (tolower (aa_getkey (context, 1)) != 'n')
+ {
++ /* Unfortunately recently added native pulseaudio
++ * driver in libmikmod does not allow you to
++ * call 'MikMod_Update' in a non-blocking way.
++ *
++ * It's a known limitation of simple pulseaudio API
++ * thus we derevisted pulseaudio driver to fallback
++ * on alsa, oss or whatever used to work for user.
++ */
++ drv_pulseaudio.Name = NULL;
++ drv_pulseaudio.Version = NULL;
++
+ MikMod_RegisterAllDrivers ();
+ MikMod_RegisterLoader (&load_s3m);
+ /*md_mode |= DMODE_SOFT_MUSIC; */
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
new file mode 100644
index 000000000000..577f306c8169
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
@@ -0,0 +1,15 @@
+Fixes warning:
+main.c: In function 'load_song':
+main.c:56:23: warning: incompatible implicit declaration of built-in function 'strlen'
+diff --git a/main.c b/main.c
+index ae852a7..417ff62 100644
+--- a/main.c
++++ b/main.c
+@@ -21,6 +21,7 @@
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
++#include <string.h>
+ #include <unistd.h>
+ #include "timers.h"
+ #include "bb.h"
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
new file mode 100644
index 000000000000..0fa98f8162f5
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
@@ -0,0 +1,396 @@
+Fix aclocal failure on libmikmod-less systems
+
+commit 55b86efdc3e2a1febb593169b10ab252c75fdb10
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue Feb 7 10:59:09 2012 +0300
+
+ bb-1.3.0_rc1: bundle m4 source
+
+diff --git m4/aalib.m4 m4/aalib.m4
+new file mode 100644
+index 0000000..991fbda
+--- /dev/null
++++ m4/aalib.m4
+@@ -0,0 +1,169 @@
++# Configure paths for AALIB
++# Jan Hubicka 4/22/2001
++# stolen from Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
++dnl
++AC_DEFUN([AM_PATH_AALIB],
++[dnl
++dnl Get the cflags and libraries from the aalib-config script
++dnl
++AC_ARG_WITH(aalib-prefix,[ --with-aalib-prefix=PFX Prefix where AALIB is installed (optional)],
++ aalib_prefix="$withval", aalib_prefix="")
++AC_ARG_WITH(aalib-exec-prefix,[ --with-aalib-exec-prefix=PFX Exec prefix where AALIB is installed (optional)],
++ aalib_exec_prefix="$withval", aalib_exec_prefix="")
++AC_ARG_ENABLE(aalibtest, [ --disable-aalibtest Do not try to compile and run a test AALIB program],
++ , enable_aalibtest=yes)
++
++ if test x$aalib_exec_prefix != x ; then
++ aalib_args="$aalib_args --exec-prefix=$aalib_exec_prefix"
++ if test x${AALIB_CONFIG+set} != xset ; then
++ AALIB_CONFIG=$aalib_exec_prefix/bin/aalib-config
++ fi
++ fi
++ if test x$aalib_prefix != x ; then
++ aalib_args="$aalib_args --prefix=$aalib_prefix"
++ if test x${AALIB_CONFIG+set} != xset ; then
++ AALIB_CONFIG=$aalib_prefix/bin/aalib-config
++ fi
++ fi
++
++ AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
++ min_aalib_version=ifelse([$1], ,0.11.0,$1)
++ AC_MSG_CHECKING(for AALIB - version >= $min_aalib_version)
++ no_aalib=""
++ if test "$AALIB_CONFIG" = "no" ; then
++ no_aalib=yes
++ else
++ AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
++ AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
++
++ aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_aalibtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $AALIB_CFLAGS"
++ LIBS="$LIBS $AALIB_LIBS"
++dnl
++dnl Now check if the installed AALIB is sufficiently new. (Also sanity
++dnl checks the results of aalib-config to some extent
++dnl
++ rm -f conf.aalibtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "aalib.h"
++
++char*
++my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str)
++ {
++ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ }
++ else
++ new_str = NULL;
++
++ return new_str;
++}
++
++int main (int argc, char *argv[])
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ /* This hangs on some systems (?)
++ system ("touch conf.aalibtest");
++ */
++ { FILE *fp = fopen("conf.aalibtest", "a"); if ( fp ) fclose(fp); }
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_aalib_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++ printf("%s, bad version string\n", "$min_aalib_version");
++ exit(1);
++ }
++
++ if (($aalib_major_version > major) ||
++ (($aalib_major_version == major) && ($aalib_minor_version > minor)) ||
++ (($aalib_major_version == major) && ($aalib_minor_version == minor) && ($aalib_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** 'aalib-config --version' returned %d.%d.%d, but the minimum version\n", $aalib_major_version, $aalib_minor_version, $aalib_micro_version);
++ printf("*** of AALIB required is %d.%d.%d. If aalib-config is correct, then it is\n", major, minor, micro);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If aalib-config was wrong, set the environment variable AALIB_CONFIG\n");
++ printf("*** to point to the correct copy of aalib-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ return 1;
++ }
++}
++
++],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_aalib" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$AALIB_CONFIG" = "no" ; then
++ echo "*** The aalib-config script installed by AALIB could not be found"
++ echo "*** If AALIB was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the AALIB_CONFIG environment variable to the"
++ echo "*** full path to aalib-config."
++ else
++ if test -f conf.aalibtest ; then
++ :
++ else
++ echo "*** Could not run AALIB test program, checking why..."
++ CFLAGS="$CFLAGS $AALIB_CFLAGS"
++ LIBS="$LIBS $AALIB_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include "AALIB.h"
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding AALIB or finding the wrong"
++ echo "*** version of AALIB. If it is not finding AALIB, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means AALIB was incorrectly installed"
++ echo "*** or that you have moved AALIB since it was installed. In the latter case, you"
++ echo "*** may want to edit the aalib-config script: $AALIB_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ AALIB_CFLAGS=""
++ AALIB_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(AALIB_CFLAGS)
++ AC_SUBST(AALIB_LIBS)
++ rm -f conf.aalibtest
++])
+diff --git m4/libmikmod.m4 m4/libmikmod.m4
+new file mode 100644
+index 0000000..18feebe
+--- /dev/null
++++ m4/libmikmod.m4
+@@ -0,0 +1,207 @@
++# Configure paths for libmikmod
++#
++# Derived from glib.m4 (Owen Taylor 97-11-3)
++# Improved by Chris Butler
++#
++
++dnl AM_PATH_LIBMIKMOD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
++dnl LIBMIKMOD_LDADD
++dnl
++AC_DEFUN([AM_PATH_LIBMIKMOD],
++[dnl
++dnl Get the cflags and libraries from the libmikmod-config script
++dnl
++AC_ARG_WITH(libmikmod-prefix,[ --with-libmikmod-prefix=PFX Prefix where libmikmod is installed (optional)],
++ libmikmod_config_prefix="$withval", libmikmod_config_prefix="")
++AC_ARG_WITH(libmikmod-exec-prefix,[ --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional)],
++ libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="")
++AC_ARG_ENABLE(libmikmodtest, [ --disable-libmikmodtest Do not try to compile and run a test libmikmod program],
++ , enable_libmikmodtest=yes)
++
++ if test x$libmikmod_config_exec_prefix != x ; then
++ libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix"
++ if test x${LIBMIKMOD_CONFIG+set} != xset ; then
++ LIBMIKMOD_CONFIG=$libmikmod_config_exec_prefix/bin/libmikmod-config
++ fi
++ fi
++ if test x$libmikmod_config_prefix != x ; then
++ libmikmod_config_args="$libmikmod_config_args --prefix=$libmikmod_config_prefix"
++ if test x${LIBMIKMOD_CONFIG+set} != xset ; then
++ LIBMIKMOD_CONFIG=$libmikmod_config_prefix/bin/libmikmod-config
++ fi
++ fi
++
++ AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no)
++ min_libmikmod_version=ifelse([$1], ,3.1.5,$1)
++ AC_MSG_CHECKING(for libmikmod - version >= $min_libmikmod_version)
++ no_libmikmod=""
++ if test "$LIBMIKMOD_CONFIG" = "no" ; then
++ no_libmikmod=yes
++ else
++ LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags`
++ LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs`
++ LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd`
++ libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
++ libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
++ libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
++ if test "x$enable_libmikmodtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ AC_LANG_SAVE
++ AC_LANG_C
++ CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD"
++ LIBS="$LIBMIKMOD_LIBS $LIBS"
++dnl
++dnl Now check if the installed libmikmod is sufficiently new. (Also sanity
++dnl checks the results of libmikmod-config to some extent
++dnl
++ rm -f conf.mikmodtest
++ AC_TRY_RUN([
++#include <mikmod.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++char* my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str) {
++ new_str = malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ } else
++ new_str = NULL;
++
++ return new_str;
++}
++
++int main()
++{
++ int major,minor,micro;
++ int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
++ char *tmp_version;
++
++ system("touch conf.mikmodtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_libmikmod_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++ printf("%s, bad version string\n", "$min_libmikmod_version");
++ exit(1);
++ }
++
++ libmikmod_major_version=(MikMod_GetVersion() >> 16) & 255;
++ libmikmod_minor_version=(MikMod_GetVersion() >> 8) & 255;
++ libmikmod_micro_version=(MikMod_GetVersion() ) & 255;
++
++ if ((libmikmod_major_version != $libmikmod_config_major_version) ||
++ (libmikmod_minor_version != $libmikmod_config_minor_version) ||
++ (libmikmod_micro_version != $libmikmod_config_micro_version))
++ {
++ printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n",
++ $libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version,
++ libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
++ printf ("*** was found! If libmikmod-config was correct, then it is best\n");
++ printf ("*** to remove the old version of libmikmod. You may also be able to fix the error\n");
++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++ printf("*** required on your system.\n");
++ printf("*** If libmikmod-config was wrong, set the environment variable LIBMIKMOD_CONFIG\n");
++ printf("*** to point to the correct copy of libmikmod-config, and remove the file config.cache\n");
++ printf("*** before re-running configure\n");
++ }
++ else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) ||
++ (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) ||
++ (libmikmod_micro_version != LIBMIKMOD_REVISION))
++ {
++ printf("*** libmikmod header files (version %d.%d.%d) do not match\n",
++ LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
++ printf("*** library (version %d.%d.%d)\n",
++ libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
++ }
++ else
++ {
++ if ((libmikmod_major_version > major) ||
++ ((libmikmod_major_version == major) && (libmikmod_minor_version > minor)) ||
++ ((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n",
++ libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
++ printf("*** You need a version of libmikmod newer than %d.%d.%d.\n",
++ major, minor, micro);
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the libmikmod-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG environment to point to the\n");
++ printf("*** correct copy of libmikmod-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ }
++ return 1;
++}
++],, no_libmikmod=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ AC_LANG_RESTORE
++ fi
++ fi
++ if test "x$no_libmikmod" = x ; then
++ AC_MSG_RESULT([yes, `$LIBMIKMOD_CONFIG --version`])
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$LIBMIKMOD_CONFIG" = "no" ; then
++ echo "*** The libmikmod-config script installed by libmikmod could not be found"
++ echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the LIBMIKMOD_CONFIG environment variable to the"
++ echo "*** full path to libmikmod-config."
++ else
++ if test -f conf.mikmodtest ; then
++ :
++ else
++ echo "*** Could not run libmikmod test program, checking why..."
++ CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
++ LIBS="$LIBS $LIBMIKMOD_LIBS"
++ AC_LANG_SAVE
++ AC_LANG_C
++ AC_TRY_LINK([
++#include <mikmod.h>
++#include <stdio.h>
++], [ return (MikMod_GetVersion()!=0); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding libmikmod or finding the wrong"
++ echo "*** version of libmikmod. If it is not finding libmikmod, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location. Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system."
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means libmikmod was incorrectly installed"
++ echo "*** or that you have moved libmikmod since it was installed. In the latter case, you"
++ echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ AC_LANG_RESTORE
++ fi
++ fi
++ LIBMIKMOD_CFLAGS=""
++ LIBMIKMOD_LIBS=""
++ LIBMIKMOD_LDADD=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(LIBMIKMOD_CFLAGS)
++ AC_SUBST(LIBMIKMOD_LIBS)
++ AC_SUBST(LIBMIKMOD_LDADD)
++ rm -f conf.mikmodtest
++])
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
new file mode 100644
index 000000000000..e46b75fd5815
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
@@ -0,0 +1,25 @@
+messager.c: fix memory overlap (fixes artefacts in scrolling text)
+
+==363== Source and destination overlap in memcpy(0xa066240, 0xa0662b8, 240)
+==363== at 0x4C2B220: memcpy@@GLIBC_2.14 (mc_replace_strmem.c:838)
+==363== by 0x407D97: newline (messager.c:43)
+==363== by 0x407EE6: put (messager.c:54)
+==363== by 0x40806E: messager (messager.c:77)
+==363== by 0x403009: bb (bb.c:258)
+==363== by 0x407C06: main (main.c:202)
+
+diff --git a/messager.c b/messager.c
+index 95cc410..964080b 100644
+--- a/messager.c
++++ b/messager.c
+@@ -40,8 +40,8 @@ static void newline()
+ start = 0;
+ cursor_y++, cursor_x = 0;
+ if (cursor_y >= aa_scrheight(context)) {
+- memcpy(context->textbuffer + start * aa_scrwidth(context), context->textbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
+- memcpy(context->attrbuffer + start * aa_scrwidth(context), context->attrbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
++ memmove(context->textbuffer + start * aa_scrwidth(context), context->textbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
++ memmove(context->attrbuffer + start * aa_scrwidth(context), context->attrbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
+ memset(context->textbuffer + aa_scrwidth(context) * (aa_scrheight(context) - 1), ' ', aa_scrwidth(context));
+ memset(context->attrbuffer + aa_scrwidth(context) * (aa_scrheight(context) - 1), 0, aa_scrwidth(context));
+ cursor_y--;
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
new file mode 100644
index 000000000000..7a6f9474a71e
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
@@ -0,0 +1,15 @@
+# remove __attribute__
+
+--- timers.h Thu Apr 26 18:04:22 2001
++++ timers.h Sun Dec 9 18:44:31 2007
+@@ -49,8 +49,8 @@
+ extern tl_group *syncgroup, *asyncgroup;
+ void tl_sleep (int);
+ void tl_allegromode (int mode); /*Just for djgpp */
+-int tl_lookup_timer (tl_timer * t) REGISTERS (3);
+-void tl_reset_timer (tl_timer * t) REGISTERS (3);
++int tl_lookup_timer (tl_timer * t);
++void tl_reset_timer (tl_timer * t);
+
+ struct timeemulator *tl_create_emulator(void);
+ void tl_free_emulator(struct timeemulator *t);
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
new file mode 100644
index 000000000000..da113795124b
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
@@ -0,0 +1,55 @@
+zoom.c: cleanup protos
+
+x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -O2 -march=core2 -pipe -I/usr/include -pthread -D_REENTRANT -D SOUNDDIR=\"/usr/share/bb\" -c zoom.c
+zoom.c: In function 'mkrealloc_table':
+zoom.c:245:113: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
+zoom.c:251:113: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
+zoom.c:260:113: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
+zoom.c: In function 'moveoldpoints':
+zoom.c:590:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
+zoom.c:596:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
+diff --git a/zoom.c b/zoom.c
+index 7450095..b86cc8b 100644
+--- a/zoom.c
++++ b/zoom.c
+@@ -241,13 +241,13 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea
+ #endif
+ if (dyndata == NULL) {
+ fprintf(stderr, "XaoS fatal error:Could not allocate memory for"
+- "temporary dynamical data of size:%i\n"
++ "temporary dynamical data of size:%li\n"
+ "I am unable to handle this problem so please resize to lower window\n", (size) * (DSIZE + 1) * sizeof(struct dyn_data) + size * sizeof(int) + size * sizeof(int));
+ return;
+ }
+ if (best == NULL) {
+ fprintf(stderr, "XaoS fatal error:Could not allocate memory for"
+- "temporary dynamical data of size:%i\n"
++ "temporary dynamical data of size:%li\n"
+ "I am unable to handle this problem so please resize to lower window\n", (size) * (DSIZE + 1) * sizeof(struct dyn_data) + size * sizeof(int) + size * sizeof(int));
+ #ifndef HAVE_ALLOCA
+ free(dyndata);
+@@ -256,7 +256,7 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea
+ }
+ if (best1 == NULL) {
+ fprintf(stderr, "XaoS fatal error:Could not allocate memory for"
+- "temporary dynamical data of size:%i\n"
++ "temporary dynamical data of size:%li\n"
+ "I am unable to handle this problem so please resize to lower window\n", (size) * (DSIZE + 1) * sizeof(struct dyn_data) + size * sizeof(int) + size * sizeof(int));
+ #ifndef HAVE_ALLOCA
+ free(dyndata);
+@@ -586,13 +586,13 @@ static /*INLINE */ void moveoldpoints(void)
+ #endif
+ if (size == NULL) {
+ fprintf(stderr, "XaoS fratal error:Could not allocate memory for"
+- "temporary dynamical data of size:%i\n"
++ "temporary dynamical data of size:%li\n"
+ "I am unable to handle this problem so please resize to lower window\n", 2 * d->width * sizeof(int));
+ return;
+ }
+ if (start == NULL) {
+ fprintf(stderr, "XaoS fratal error:Could not allocate memory for"
+- "temporary dynamical data of size:%i\n"
++ "temporary dynamical data of size:%li\n"
+ "I am unable to handle this problem so please resize to lower window\n", 2 * d->width * sizeof(int));
+ #ifndef HAVE_ALLOCA
+ free(size);
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
new file mode 100644
index 000000000000..aa3fc021e5c1
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
@@ -0,0 +1,16 @@
+diff --git a/bb.c b/bb.c
+index 95850ef..a394d00 100644
+--- a/bb.c
++++ b/bb.c
+@@ -27,2 +27,3 @@
+ #include <aalib.h>
++#include <time.h>
+ #include "bb.h"
+diff --git a/main.c b/main.c
+index 417ff62..c0648b4 100644
+--- a/main.c
++++ b/main.c
+@@ -23,2 +23,3 @@
+
++#include <ctype.h>
+ #include <string.h>
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
new file mode 100644
index 000000000000..b3e882ed55e9
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
@@ -0,0 +1,35 @@
+tex.c: Fix out-of-bounds zbuff clearing
+
+> zbuff = (int *) malloc(X_s * Y_s * sizeof(int));
+> memset(zbuff, 0x55, (X_s * Y_s * sizeof(long)));
+
+Ouch! amd64: sizeof(long) == 8; sizeof (int) == 4
+
+Valgrind says:
+==4525== Invalid write of size 4
+==4525== at 0x4C2C3AF: memset (mc_replace_strmem.c:967)
+==4525== by 0x4122E0: clear_zbuff (tex.c:95)
+==4525== by 0x4144D8: disp3d (tex.c:292)
+==4525== by 0x40F3C6: scene5 (scene5.c:206)
+==4525== by 0x4031BC: bb (bb.c:325)
+==4525== by 0x407C56: main (main.c:202)
+==4525== Address 0xac9ef00 is 0 bytes after a block of size 34,992 alloc'd
+==4525== at 0x4C2996D: malloc (vg_replace_malloc.c:263)
+==4525== by 0x412283: set_zbuff (tex.c:85)
+==4525== by 0x40F347: scene5 (scene5.c:196)
+==4525== by 0x4031BC: bb (bb.c:325)
+==4525== by 0x407C56: main (main.c:202)
+
+diff --git a/tex.c b/tex.c
+index 9f2f99d..b390510 100644
+--- a/tex.c
++++ b/tex.c
+@@ -92,7 +92,7 @@ void unset_zbuff()
+
+ static inline void clear_zbuff()
+ {
+- memset(zbuff, 0x55, (X_s * Y_s * sizeof(long)));
++ memset(zbuff, 0x55, (X_s * Y_s * sizeof(int)));
+ }
+
+
diff --git a/app-misc/bb/metadata.xml b/app-misc/bb/metadata.xml
new file mode 100644
index 000000000000..401e82106a05
--- /dev/null
+++ b/app-misc/bb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">aa-project</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/beancounter-0.8.10-r1 b/app-misc/beancounter-0.8.10-r1
deleted file mode 100644
index cb5b16824338..000000000000
--- a/app-misc/beancounter-0.8.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Date-Manip dev-perl/Statistics-Descriptive dev-perl/Finance-YahooQuote dev-perl/libwww-perl mysql? ( dev-perl/DBD-mysql ) sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Finance performance calculation engine with full data acquisition, SQL support
-EAPI=5
-HOMEPAGE=http://dirk.eddelbuettel.com/code/beancounter.html
-IUSE=mysql postgres sqlite
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Date-Manip dev-perl/Statistics-Descriptive dev-perl/Finance-YahooQuote dev-perl/libwww-perl mysql? ( dev-perl/DBD-mysql ) sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) dev-perl/DBI dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://eddelbuettel.com/dirk/code/beancounter/beancounter_0.8.10.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93e01a44c03ac03769c4e3acd30f8eb0
diff --git a/app-misc/beancounter/Manifest b/app-misc/beancounter/Manifest
new file mode 100644
index 000000000000..0fbf42ccb62e
--- /dev/null
+++ b/app-misc/beancounter/Manifest
@@ -0,0 +1,3 @@
+DIST beancounter_0.8.10.tar.gz 88658 BLAKE2B e2f848289398e45066375f80a0e7e2d0e93e7bbaa1d957acff95e67c2f8ecf482c3fae9cda7c64735974f7228d15308e99b841716d26a5847ee4de2bd5e81e67 SHA512 6d1270f0846987fe73480e0f6b46d1c27971d70ffe2622dee9a907f852249f7d30459003cc560c95dff9e6c973a88e81c4f6f63af8f8aa278861962bba703c1b
+EBUILD beancounter-0.8.10-r1.ebuild 878 BLAKE2B 5da0358bda2b97afa349fa2100f05b6336f44cf6bf2e2eb92c730abd379eddac7aaabffdd995f890e2f6ba7ea1ebabd6ced55f2fb41ccfb04700b7f7cf760f05 SHA512 467645c90cfeb26bb6a011e422c3e7def9e000aec30fb90aaef0a6e5e852303cee4da4a351af75317de84c79582057b829d70f801528221e3f303c60ab49e83f
+MISC metadata.xml 323 BLAKE2B a124f17ff830d781687a13ce15eb6ef109741b360aa85169d73a1f66786835a46b51f678127fa0264b03b47d8931bd8b9425cd1a171e2603d5f2d5aee796c558 SHA512 45dbc118728f97578e8c3f89eef2facb9c8b1e0acd3fcd8fbf2f502ff2b60eb0e7eb7553ff90915d12835f6c04982c281bb75f7ffb66d45199530a1d7c3410bf
diff --git a/app-misc/beancounter/beancounter-0.8.10-r1.ebuild b/app-misc/beancounter/beancounter-0.8.10-r1.ebuild
new file mode 100644
index 000000000000..cfcb888f6d28
--- /dev/null
+++ b/app-misc/beancounter/beancounter-0.8.10-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Finance performance calculation engine with full data acquisition, SQL support"
+HOMEPAGE="http://dirk.eddelbuettel.com/code/beancounter.html"
+SRC_URI="http://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql postgres sqlite"
+
+DEPEND="dev-perl/Date-Manip
+ dev-perl/Statistics-Descriptive
+ dev-perl/Finance-YahooQuote
+ dev-perl/libwww-perl
+ mysql? ( dev-perl/DBD-mysql )
+ sqlite? ( dev-perl/DBD-SQLite )
+ postgres? ( dev-perl/DBD-Pg )"
+
+RDEPEND="${DEPEND} dev-perl/DBI"
+mydoc="README example.beancounterrc beancounter_*.txt "
+
+src_install() {
+ perl-module_src_install
+ # rm unwanted READMEs
+ rm "${D}"usr/share/doc/${PF}/{README.Debian,README.non-gnu} || die
+}
diff --git a/app-misc/beancounter/metadata.xml b/app-misc/beancounter/metadata.xml
new file mode 100644
index 000000000000..055dc06115a6
--- /dev/null
+++ b/app-misc/beancounter/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ Finance performance calculation engine with data acquisition (Yahoo! Finance)
+ and SQL backend support.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/beanstalkd-1.10 b/app-misc/beanstalkd-1.10
deleted file mode 100644
index d0c0a4a17952..000000000000
--- a/app-misc/beanstalkd-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple, fast work queue
-EAPI=5
-HOMEPAGE=http://kr.github.io/beanstalkd/
-KEYWORDS=amd64 ~mips x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d159665a0a09de680b8784baab4bff24
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
new file mode 100644
index 000000000000..281f83895038
--- /dev/null
+++ b/app-misc/beanstalkd/Manifest
@@ -0,0 +1,7 @@
+AUX conf 292 BLAKE2B 985eee63e2f797dc7bb84a19b5dfb77bd6bf171d675f881226fc2b5a833392f179c040d71f45b4b4a8fe723eb7981f5fdb317d7be3dc7c7725c46879bbb10412 SHA512 56c3fe690e513f0e96ef486dbee3dc862409321935be03977d38a47641e7b8fd87c2b2a29d444320a1554689df497b5aee204922f2059a1e2d1139b8fce6291a
+AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c40d4b84d554c11ffb9d3c628b0142f5ce33d6f5e1ff8b140d8cd7d05642648c2e4f8bc700d SHA512 981dc0dca903f8ebdd3cc80368650d42f02bf194ccd12e64d2d4cc273ae13ec42da69341529750bca7232d7bcb3df67a02aa3db6179c4835682e86fabef689f0
+AUX init 477 BLAKE2B 9f0ce8f2c5c17e526f49d25e744d00f3784e672ef06e30fd3033e7b76a5221fc3ffcf68618e6434dfe7eaf83a361d4c6faa7799ce5342d5c546edc3f0930a499 SHA512 cbeaeac8a993711822086a761b624783bbf4ff11cff5c569a4c0cd3e6e174fe36904a661155c1460f7b43e0b2d6b631cd9e290d76138520021a702567b0494dd
+AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
+DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
+EBUILD beanstalkd-1.10.ebuild 1062 BLAKE2B 0e81ee56bb61a007986c12af4733891272807ac362c772adf7e8c0d4c1385e4f098cf3a93d1b4c8068d8f645c79db3a5fc2668f54b07e831fc14260175b7058d SHA512 0799c734bd5eeeb4d8dd171c65f2c1aefb6cfeb43513e11a5d5d2ccc8dc1a40785af1baab54314ad8564236580aaa721446d1c4f17dc94c4cd48630a001e59ed
+MISC metadata.xml 436 BLAKE2B 72356d3a95f45dc54e13946b8d41e698b60d44205e9ec90cee10d916f71ed0e6ed2a81929cbc705c8eeae00587790b2c4d2439a0ca366f28cf123ddcf3137f38 SHA512 7766293e42fb4786e971b259480f4e697745d23db9b332e24c7edda52d8ccbc2ebdb1ed1b1c9265f22d9ec698fc144acd6e7576cef66f3a33db8a4f102b08140
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
new file mode 100644
index 000000000000..f49d66ec2e70
--- /dev/null
+++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs user
+
+DESCRIPTION="A simple, fast work queue"
+HOMEPAGE="http://kr.github.io/beanstalkd/"
+SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+
+RDEPEND=""
+DEPEND=""
+
+IUSE=""
+
+DOCS=( README News docs/protocol.txt )
+
+pkg_setup() {
+ enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
+}
+
+src_prepare() {
+ sed -i -e "s/CFLAGS=/CFLAGS?=/" \
+ -e "s/LDLIBS/LDFLAGS/" \
+ -e "s/LDFLAGS=/LDFLAGS?=/" Makefile
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+ dobin beanstalkd
+
+ DATADIR=/var/lib/${PN}
+ dodir ${DATADIR}
+ fowners beanstalk:daemon ${DATADIR}
+
+ doman doc/"${PN}".1
+
+ newconfd "${FILESDIR}/conf-1.9" beanstalkd
+ newinitd "${FILESDIR}/init-1.9" beanstalkd
+
+ systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
+}
diff --git a/app-misc/beanstalkd/files/conf b/app-misc/beanstalkd/files/conf
new file mode 100644
index 000000000000..c646326bf271
--- /dev/null
+++ b/app-misc/beanstalkd/files/conf
@@ -0,0 +1,14 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BEANSTALKD_BINARY="/usr/bin/beanstalkd"
+PIDFILE="/var/run/beanstalkd.pid"
+
+# User to run as
+USER="beanstalk"
+
+# Port to listen on
+PORT="11300"
+
+# Address to listen on
+ADDR="127.0.0.1"
diff --git a/app-misc/beanstalkd/files/conf-1.9 b/app-misc/beanstalkd/files/conf-1.9
new file mode 100644
index 000000000000..0b35cb874076
--- /dev/null
+++ b/app-misc/beanstalkd/files/conf-1.9
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BEANSTALKD_BINARY="/usr/bin/beanstalkd"
+PIDFILE="/run/beanstalkd.pid"
+
+# User to run as
+USER="beanstalk"
+
+# Port to listen on
+PORT="11300"
+
+# Address to listen on
+ADDR="127.0.0.1"
+
+# Datadir (where to store queue)
+DATADIR="/var/lib/beanstalkd"
+
+# Max job size
+JOB_SIZE="65536"
diff --git a/app-misc/beanstalkd/files/init b/app-misc/beanstalkd/files/init
new file mode 100644
index 000000000000..2dddc9d6d6f4
--- /dev/null
+++ b/app-misc/beanstalkd/files/init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -d -p ${PORT} -l ${ADDR} -u ${USER}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+}
diff --git a/app-misc/beanstalkd/files/init-1.9 b/app-misc/beanstalkd/files/init-1.9
new file mode 100644
index 000000000000..14dae315e170
--- /dev/null
+++ b/app-misc/beanstalkd/files/init-1.9
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of MIT
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting beanstalkd"
+ /sbin/start-stop-daemon --start \
+ --background \
+ --pidfile ${PIDFILE} --make-pidfile \
+ --exec ${BEANSTALKD_BINARY} \
+ -- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER} -z ${JOB_SIZE}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping beanstalkd"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${BEANSTALKD_BINARY}
+ eend $?
+}
diff --git a/app-misc/beanstalkd/metadata.xml b/app-misc/beanstalkd/metadata.xml
new file mode 100644
index 000000000000..f0352343e9be
--- /dev/null
+++ b/app-misc/beanstalkd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <longdescription lang="en">
+beanstalked is a fast distributed workqueue service
+</longdescription>
+ <upstream>
+ <remote-id type="github">kr/beanstalkd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/beep-1.3-r3 b/app-misc/beep-1.3-r3
deleted file mode 100644
index 9bc49d010d16..000000000000
--- a/app-misc/beep-1.3-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=The advanced PC speaker beeper
-EAPI=6
-HOMEPAGE=http://www.johnath.com/beep
-IUSE=suid
-KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.johnath.com/beep/beep-1.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=91ea73bf0eadb72e5b2db14eca022cd1
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
new file mode 100644
index 000000000000..c70d0923038c
--- /dev/null
+++ b/app-misc/beep/Manifest
@@ -0,0 +1,5 @@
+AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
+AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
+DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
+EBUILD beep-1.3-r3.ebuild 680 BLAKE2B d9b7f48c566189b8eb6c35cc3bbc39824bd539d74b2f95072b4dbe5d28e5361bcc7d08d4575fdb6b0f9e3fd301186c84b251accd236b9f004a206f0a30ae8f11 SHA512 2069f3daff4130277d6b1062040aeda4c494e1425ba55eaf85ffb130859971cccc56bf1dd99239cbbe30f17870acd80777723eb1e90a67be8d6863f347d94dad
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
new file mode 100644
index 000000000000..a6c0024d4f55
--- /dev/null
+++ b/app-misc/beep/beep-1.3-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="The advanced PC speaker beeper"
+HOMEPAGE="http://www.johnath.com/beep"
+SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+IUSE="suid"
+
+PATCHES=(
+ "${FILESDIR}/${P}-Makefile.patch"
+ "${FILESDIR}/${P}-CVE-2018-0492.patch"
+)
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_install() {
+ dobin beep
+ if use suid; then
+ fowners :audio /usr/bin/beep
+ fperms 4710 /usr/bin/beep
+ else
+ fperms 0711 /usr/bin/beep
+ fi
+ unpack "./${PN}.1.gz"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch b/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
new file mode 100644
index 000000000000..f4894b51fc81
--- /dev/null
+++ b/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
@@ -0,0 +1,106 @@
+diff --git a/beep.c b/beep.c
+index 7da2e70..4323d31 100644
+--- beep.c
++++ beep.c
+@@ -109,6 +109,7 @@ void do_beep(int freq) {
+ /* BEEP_TYPE_EVDEV */
+ struct input_event e;
+
++ memset(&e, 0, sizeof(e));
+ e.type = EV_SND;
+ e.code = SND_TONE;
+ e.value = freq;
+@@ -124,10 +125,6 @@ void do_beep(int freq) {
+ /* If we get interrupted, it would be nice to not leave the speaker beeping in
+ perpetuity. */
+ void handle_signal(int signum) {
+-
+- if(console_device)
+- free(console_device);
+-
+ switch(signum) {
+ case SIGINT:
+ case SIGTERM:
+@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
+ result->verbose = 1;
+ break;
+ case 'e' : /* also --device */
+- console_device = strdup(optarg);
++ console_device = optarg;
+ break;
+ case 'h' : /* notice that this is also --help */
+ default :
+@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) {
+ "%d delay after) @ %.2f Hz\n",
+ parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
+
+- /* try to snag the console */
+- if(console_device)
+- console_fd = open(console_device, O_WRONLY);
+- else
+- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
+- console_fd = open("/dev/vc/0", O_WRONLY);
+-
+- if(console_fd == -1) {
+- fprintf(stderr, "Could not open %s for writing\n",
+- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
+- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
+- perror("open");
+- exit(1);
+- }
+-
+- if (ioctl(console_fd, EVIOCGSND(0)) != -1)
+- console_type = BEEP_TYPE_EVDEV;
+- else
+- console_type = BEEP_TYPE_CONSOLE;
+-
+ /* Beep */
+ for (i = 0; i < parms.reps; i++) { /* start beep */
+ do_beep(parms.freq);
+@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) {
+ if(parms.end_delay || (i+1 < parms.reps))
+ usleep(1000*parms.delay); /* wait... */
+ } /* repeat. */
+-
+- close(console_fd);
+ }
+
+
+@@ -328,6 +303,26 @@ int main(int argc, char **argv) {
+ signal(SIGTERM, handle_signal);
+ parse_command_line(argc, argv, parms);
+
++ /* try to snag the console */
++ if(console_device)
++ console_fd = open(console_device, O_WRONLY);
++ else
++ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
++ console_fd = open("/dev/vc/0", O_WRONLY);
++
++ if(console_fd == -1) {
++ fprintf(stderr, "Could not open %s for writing\n",
++ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
++ perror("open");
++ exit(1);
++ }
++
++ if (ioctl(console_fd, EVIOCGSND(0)) != -1)
++ console_type = BEEP_TYPE_EVDEV;
++ else
++ console_type = BEEP_TYPE_CONSOLE;
++
+ /* this outermost while loop handles the possibility that -n/--new has been
+ used, i.e. that we have multiple beeps specified. Each iteration will
+ play, then free() one parms instance. */
+@@ -365,8 +360,8 @@ int main(int argc, char **argv) {
+ parms = next;
+ }
+
+- if(console_device)
+- free(console_device);
++ close(console_fd);
++ console_fd = -1;
+
+ return EXIT_SUCCESS;
+ }
diff --git a/app-misc/beep/files/beep-1.3-Makefile.patch b/app-misc/beep/files/beep-1.3-Makefile.patch
new file mode 100644
index 000000000000..f4b891e8b824
--- /dev/null
+++ b/app-misc/beep/files/beep-1.3-Makefile.patch
@@ -0,0 +1,26 @@
+--- a/Makefile 2002-03-29 09:37:22.000000000 -0800
++++ b/Makefile 2009-03-27 22:19:18.000000000 -0700
+@@ -1,17 +1,18 @@
+-CC=gcc
+-FLAGS=-Wall
++CC ?= gcc
++LDFLAGS ?=
++CFLAGS ?= -Wall
+ EXEC_NAME=beep
+ INSTALL_DIR=/usr/bin
+ MAN_FILE=beep.1.gz
+-MAN_DIR=/usr/man/man1
++MAN_DIR=/usr/share/man/man1
+
+ default : beep
+
+ clean :
+- rm ${EXEC_NAME}
++ rm -f ${EXEC_NAME}
+
+ beep : beep.c
+- ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
++ ${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c
+
+ install :
+ cp ${EXEC_NAME} ${INSTALL_DIR}
diff --git a/app-misc/beep/metadata.xml b/app-misc/beep/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/beep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/bfm-1.2-r2 b/app-misc/bfm-1.2-r2
deleted file mode 100644
index 76a4dc65e6d1..000000000000
--- a/app-misc/bfm-1.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/sun-java3d-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=File manager and first person shooter written in Java3D, shoot to remove files
-EAPI=5
-HOMEPAGE=http://bfm.webhop.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 dev-java/sun-java3d-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ceb130ba5ea4c1462c3b659126a18ea8
diff --git a/app-misc/bfm/Manifest b/app-misc/bfm/Manifest
new file mode 100644
index 000000000000..00bb0aae2a3a
--- /dev/null
+++ b/app-misc/bfm/Manifest
@@ -0,0 +1,5 @@
+AUX 1.2-r2-build.xml 2020 BLAKE2B 7432c22c7d0ba7b4297455724d365e95ebbc1f0470c06b83539c93275e1cbe281ada6be7cf3578a783782be4911be2bc094a5d36d1343c1e355d4d5e024964bf SHA512 422208eb70459b94b6d5eb831c5796cfe178b2042dd6aee4fc0c1ed15949b46eac5e817460ba3391fbaad7f287e6260f6ed436e49d84ab41fac2453518aae6a4
+AUX 1.2-r2-package.patch 10235 BLAKE2B f767f00a81b8ffe5c831604f2ecc7b6c0b7f3bb86ff22925c4a8e5c2fc2010947c1f5775cb5da857fd66f5d6bd70f5a9c031c1ae59ddfe89ebdd9b9eb2ca5919 SHA512 9b754c0dac3f7f8763acc80ae9fe618dca32df319dc2b928ec856debc4f539f6f39fa6dde92eb871dcccb9197f7aecbac6b65b7705d476c0b73e6611e979dbce
+DIST bfm-1.2.tar.gz 193924 BLAKE2B 8d398188333519b581a8eb4e38fc123672ba0a68077347f4049e5f0ec9dc06010b5e6003500452dad71deb67fe97e5ea896ec9ab425eca82022a12e03320b3ec SHA512 39a9a250a8f3cf3b148c31a9fa5a89ac9a5873884dc1a98840b2f21879b30bd7cc6cc5dd9c5f7e657090a56276dbef2a72594e095aec8c05f3e003f89e91daee
+EBUILD bfm-1.2-r2.ebuild 1342 BLAKE2B ba316b23f2aa3d0885c791decef0ceadbf15e56933a6ab4f0cd2a322b946576fb9bae58eda0a34798f44a0abcf49452ce0e1d7d23070adda6490a944a1320a18 SHA512 847c1da49ca1d39301a46fc522f8c1c2143cff3ba613413a3aba8c624908aef2401931285b1a003be73bcd7610f6b94bd9a84351fd1fbb74718e952167f5d677
+MISC metadata.xml 550 BLAKE2B df05e7ad2cc4aca624ad2a377fd7e555cb6c5c600b2860558628746ae6361649b0dcdb4e76a4740a4b37e3bfa91b2debbd8019db1a87caa804bee552461e9283 SHA512 755c28c22ed330af89b04ee96ed3912016dc473813b8730bca2eea7548c4e9f4953a7f645512e46627b4e9a6bddb243fe8e41a4a489325a4bd13209b4d83cfdd
diff --git a/app-misc/bfm/bfm-1.2-r2.ebuild b/app-misc/bfm/bfm-1.2-r2.ebuild
new file mode 100644
index 000000000000..b28cee6a8636
--- /dev/null
+++ b/app-misc/bfm/bfm-1.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="File manager and first person shooter written in Java3D, shoot to remove files"
+HOMEPAGE="http://bfm.webhop.net"
+SRC_URI="http://bfm.webhop.net/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/sun-java3d-bin:0"
+
+RDEPEND=">=virtual/jre-1.4
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+ ${CDEPEND}"
+
+java_prepare() {
+ cp "${FILESDIR}"/${PVR}-build.xml ./build.xml || die
+
+ mkdir lib || die
+ pushd lib
+ java-pkg_jar-from sun-java3d-bin
+ popd
+
+ epatch "${FILESDIR}"/${PVR}-package.patch
+
+ mkdir -p net/webhop/bfm || die
+ mv src/* net/webhop/bfm/ || die
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+ local java3d="sun-java3d-bin"
+
+ java-pkg_dojar dist/${PN}.jar
+ java-pkg_dolauncher ${PN} --main net.webhop.bfm.Bfm
+
+ insinto /etc/bfm
+ doins "${S}/bfm.conf"
+
+ if use doc; then
+ dodoc README ChangeLog bindings NEWS
+ java-pkg_dohtml -r docs/*
+ fi
+
+ use source && java-pkg_dosrc src/*
+}
+
+pkg_postinst() {
+ elog "A system wide config file has been installed to /etc/bfm/bfm.conf"
+ elog "Copy the file to ~/.bfm/bfm.conf to set local settings"
+ echo
+ ewarn "Be sure to run bfm in safe mode if you don't want to delete files"
+}
diff --git a/app-misc/bfm/files/1.2-r2-build.xml b/app-misc/bfm/files/1.2-r2-build.xml
new file mode 100644
index 000000000000..3c056688129d
--- /dev/null
+++ b/app-misc/bfm/files/1.2-r2-build.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<project name="bfm" default="jar">
+ <!-- some properties -->
+ <property name="src.dir" value="net" />
+ <property name="build.dir" value="build" />
+ <property name="docs.dir" value="docs" />
+ <property name="dist.dir" value="dist" />
+ <property name="lib.dir" value="lib" />
+ <property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
+ <property name="target.jdk" value="1.4" />
+
+ <!-- init -->
+ <target name="init">
+ <mkdir dir="${dist.dir}" />
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${docs.dir}" />
+ </target>
+
+ <!-- classpath -->
+ <path id="refcp">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+ <!-- compile everything -->
+ <target name="compile" depends="init">
+ <mkdir dir="${build.dir}" />
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ source="${target.jdk}"
+ target="${target.jdk}"
+ classpathref="refcp" />
+
+ <copy todir="${build.dir}">
+ <fileset file="${src.dir}/webhop/bfm/data" />
+ </copy>
+ <copy todir="${build.dir}/net/webhop/bfm/data">
+ <fileset dir="${src.dir}/webhop/bfm/data" />
+ </copy>
+ </target>
+
+ <!-- build the jar file -->
+ <target name="jar" depends="compile">
+ <jar jarfile="${jarfile}" basedir="${build.dir}"
+ manifest="${src.dir}/webhop/bfm/data/manifest" />
+ </target>
+
+ <!-- generate javadocs -->
+ <target name="docs" depends="init">
+ <javadoc sourcepath="."
+ packagenames="*"
+ destdir="${docs.dir}"
+ author="true"
+ version="true"
+ use="true"
+ windowtitle="${ant.project.name} API" />
+ </target>
+
+ <!-- clean up -->
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ <delete dir="${docs.dir}" />
+ <delete dir="${dist.dir}" />
+ </target>
+
+ <!-- zip the sources -->
+ <target name="sourcezip">
+ <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+ <zipfileset dir="${src.dir}" />
+ </zip>
+ </target>
+
+</project>
diff --git a/app-misc/bfm/files/1.2-r2-package.patch b/app-misc/bfm/files/1.2-r2-package.patch
new file mode 100644
index 000000000000..7b3db3a4415d
--- /dev/null
+++ b/app-misc/bfm/files/1.2-r2-package.patch
@@ -0,0 +1,313 @@
+diff -urN a/src/Bfm.java b/src/Bfm.java
+--- a/src/Bfm.java 2005-02-22 03:07:39.000000000 +0100
++++ b/src/Bfm.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import javax.swing.*;
+ import com.sun.j3d.utils.universe.*;
+diff -urN a/src/Blood.java b/src/Blood.java
+--- a/src/Blood.java 2005-01-08 23:45:41.000000000 +0100
++++ b/src/Blood.java 2013-06-10 08:37:16.978094948 +0200
+@@ -26,6 +26,8 @@
+ A big thank to Andrew for letting us use his code!
+ */
+
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import com.sun.j3d.utils.image.*;
+diff -urN a/src/DroppedDynamite.java b/src/DroppedDynamite.java
+--- a/src/DroppedDynamite.java 2004-12-31 14:23:44.000000000 +0100
++++ b/src/DroppedDynamite.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Dynamite.java b/src/Dynamite.java
+--- a/src/Dynamite.java 2005-02-18 21:24:29.000000000 +0100
++++ b/src/Dynamite.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Explotion.java b/src/Explotion.java
+--- a/src/Explotion.java 2005-02-20 23:55:12.000000000 +0100
++++ b/src/Explotion.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/FSDefault.java b/src/FSDefault.java
+--- a/src/FSDefault.java 2005-01-04 16:02:08.000000000 +0100
++++ b/src/FSDefault.java 2013-06-10 08:37:16.978094948 +0200
+@@ -20,6 +20,8 @@
+ /* FS stands for FileShape but is actually an transformgroup
+ containing the visuall shape of the FileObjet*/
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FSDocument.java b/src/FSDocument.java
+--- a/src/FSDocument.java 2005-01-04 16:02:08.000000000 +0100
++++ b/src/FSDocument.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FSPicture.java b/src/FSPicture.java
+--- a/src/FSPicture.java 2005-02-22 02:29:54.000000000 +0100
++++ b/src/FSPicture.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FSVideo.java b/src/FSVideo.java
+--- a/src/FSVideo.java 2005-01-04 16:02:08.000000000 +0100
++++ b/src/FSVideo.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/FileObject.java b/src/FileObject.java
+--- a/src/FileObject.java 2005-02-20 23:55:12.000000000 +0100
++++ b/src/FileObject.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/GrapplingHook.java b/src/GrapplingHook.java
+--- a/src/GrapplingHook.java 2005-01-03 06:03:50.000000000 +0100
++++ b/src/GrapplingHook.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Hud.java b/src/Hud.java
+--- a/src/Hud.java 2005-02-21 19:14:18.000000000 +0100
++++ b/src/Hud.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import java.awt.*;
+ import javax.media.j3d.*;
+diff -urN a/src/OpenDialog.java b/src/OpenDialog.java
+--- a/src/OpenDialog.java 2005-02-21 18:36:44.000000000 +0100
++++ b/src/OpenDialog.java 2013-06-10 08:37:16.978094948 +0200
+@@ -16,6 +16,9 @@
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++
++package net.webhop.bfm;
++
+ import javax.swing.plaf.*;
+ import java.awt.*;
+ import java.awt.event.*;
+diff -urN a/src/Pattern.java b/src/Pattern.java
+--- a/src/Pattern.java 2004-12-31 14:22:27.000000000 +0100
++++ b/src/Pattern.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import javax.vecmath.*;
+
+ public abstract class Pattern {
+diff -urN a/src/PatternCircle.java b/src/PatternCircle.java
+--- a/src/PatternCircle.java 2004-12-31 14:22:27.000000000 +0100
++++ b/src/PatternCircle.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import javax.vecmath.*;
+
+ public class PatternCircle extends Pattern {
+diff -urN a/src/PhysicsHandler.java b/src/PhysicsHandler.java
+--- a/src/PhysicsHandler.java 2005-02-21 18:36:44.000000000 +0100
++++ b/src/PhysicsHandler.java 2013-06-10 08:37:16.978094948 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import java.io.*;
+diff -urN a/src/Player.java b/src/Player.java
+--- a/src/Player.java 2005-02-21 18:30:54.000000000 +0100
++++ b/src/Player.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.universe.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Rocket.java b/src/Rocket.java
+--- a/src/Rocket.java 2004-12-31 14:22:27.000000000 +0100
++++ b/src/Rocket.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/RocketLauncher.java b/src/RocketLauncher.java
+--- a/src/RocketLauncher.java 2005-01-08 01:22:40.000000000 +0100
++++ b/src/RocketLauncher.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Room.java b/src/Room.java
+--- a/src/Room.java 2005-02-20 23:55:12.000000000 +0100
++++ b/src/Room.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import java.io.*;
+diff -urN a/src/RoomObject.java b/src/RoomObject.java
+--- a/src/RoomObject.java 2005-02-20 23:55:12.000000000 +0100
++++ b/src/RoomObject.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+
+ public abstract class RoomObject extends BranchGroup {
+diff -urN a/src/Shotgun.java b/src/Shotgun.java
+--- a/src/Shotgun.java 2005-01-08 01:22:40.000000000 +0100
++++ b/src/Shotgun.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/SniperRifle.java b/src/SniperRifle.java
+--- a/src/SniperRifle.java 2005-02-20 18:16:14.000000000 +0100
++++ b/src/SniperRifle.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Spear.java b/src/Spear.java
+--- a/src/Spear.java 2005-01-03 02:00:41.000000000 +0100
++++ b/src/Spear.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+diff -urN a/src/Wall.java b/src/Wall.java
+--- a/src/Wall.java 2005-01-03 20:40:55.000000000 +0100
++++ b/src/Wall.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import java.awt.*;
+ import com.sun.j3d.utils.geometry.*;
+ import javax.media.j3d.*;
+diff -urN a/src/Weapon.java b/src/Weapon.java
+--- a/src/Weapon.java 2005-02-21 18:36:44.000000000 +0100
++++ b/src/Weapon.java 2013-06-10 08:37:16.974761615 +0200
+@@ -17,6 +17,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++package net.webhop.bfm;
++
+ import javax.media.j3d.*;
+ import javax.vecmath.*;
+ import com.sun.j3d.utils.picking.*;
diff --git a/app-misc/bfm/metadata.xml b/app-misc/bfm/metadata.xml
new file mode 100644
index 000000000000..46e235531ce3
--- /dev/null
+++ b/app-misc/bfm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+
+<longdescription>
+ BFM, the Brutal File Manager is a combined file manager and first
+ person shooter game. The basic idea is to represent different folders
+ on your computer as rooms in a 3D environment. Then, armed to your
+ teeths you go through these rooms and delete files by shooting at them.
+</longdescription>
+
+</pkgmetadata>
diff --git a/app-misc/bfr-1.6-r2 b/app-misc/bfr-1.6-r2
deleted file mode 100644
index 425e5dd30e01..000000000000
--- a/app-misc/bfr-1.6-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=General-purpose command-line pipe buffer
-EAPI=5
-HOMEPAGE=http://www.glines.org/software/bfr
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.glines.org/bin/pk/bfr-1.6.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15201e23625f48b9b6f302d72e3dee4a
diff --git a/app-misc/bfr-1.6-r3 b/app-misc/bfr-1.6-r3
deleted file mode 100644
index c01b1d845999..000000000000
--- a/app-misc/bfr-1.6-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-lang/perl
-DESCRIPTION=General-purpose command-line pipe buffer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.glines.org/bin/pk/bfr-1.6.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a2a642a677f2c4db57142ae5f87460a
diff --git a/app-misc/bfr/Manifest b/app-misc/bfr/Manifest
new file mode 100644
index 000000000000..2b9c0959364e
--- /dev/null
+++ b/app-misc/bfr/Manifest
@@ -0,0 +1,5 @@
+AUX bfr-1.6-perl.patch 326 BLAKE2B b5e5273b8cd5e198d5c3dd76740d7d3e8588571e29822095ffe3b0eb50a85d6422163aca0774d8de955c64bf066ffc445d3e140eb5dcb4d06e39274c07e8e6fe SHA512 8f65f5113b60a6cbe692b9b2cbf02a7a7b3f046a6a5203cc05cae7a08e1344afd5ababa41608d334d5d1f04afb0eb2bf705622056c5620626805eec41351ffc3
+DIST bfr-1.6.tar.bz2 81002 BLAKE2B 24339eb7e882ca319b29a2a5e033ccfd6a0abe920572d4f023b4ad0321e2e9ce3096c3aba317bada297f9d17bbe368edf08cddd903377e99f5cc2a1dda7261ea SHA512 19939218029219cc328e3efb8e799bb8c755ccff7b8cb81ba0c735d499a48f581aa42322045fdbd153dcfdb8792e84d9fddbfba9e9c5d94675e2830163936762
+EBUILD bfr-1.6-r2.ebuild 460 BLAKE2B 5f469a0545ca5b2990afc8875415ca628fe39a24881d7761ef43525937ce5209f70b1a140c66d73bd5b33778075213104b77245ace7efcc1f371f930de56ddab SHA512 7a1863a503b5c7c0c8cb644cfdc6082bf3cd971b33e3e9d2f7dce6d7a37c07d9a09bb4e87d9b7388d75bdca7f1fb2dc7ba89777e6062d6d5b27f6cbb91c864fc
+EBUILD bfr-1.6-r3.ebuild 486 BLAKE2B fab912d6aeb9c8ca3cbf22b0f781f3fb92692e008780ec53219c794ce7fed5c3288349cef8750271e420170474b17b764ca6d030c4c12ea842437f1c70943986 SHA512 e85a1a75106c0e7ae1fdcd0777bfc9ffc5bf8e97f21ee609f937f17fdaf1450a43204902ceeac246c710cf777dc6b08f49e0108a5c76f55ce92b2524757eb362
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/bfr/bfr-1.6-r2.ebuild b/app-misc/bfr/bfr-1.6-r2.ebuild
new file mode 100644
index 000000000000..891d67b0da5f
--- /dev/null
+++ b/app-misc/bfr/bfr-1.6-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="General-purpose command-line pipe buffer"
+HOMEPAGE="http://www.glines.org/software/bfr"
+SRC_URI="http://www.glines.org/bin/pk/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+
+DEPEND="dev-lang/perl"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-perl.patch
+ tc-export CC
+}
diff --git a/app-misc/bfr/bfr-1.6-r3.ebuild b/app-misc/bfr/bfr-1.6-r3.ebuild
new file mode 100644
index 000000000000..8a27acb19cf6
--- /dev/null
+++ b/app-misc/bfr/bfr-1.6-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="General-purpose command-line pipe buffer"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://www.glines.org/bin/pk/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-lang/perl"
+
+PATCHES=( "${FILESDIR}/${P}-perl.patch" )
+
+src_configure() {
+ tc-export CC
+ default
+}
diff --git a/app-misc/bfr/files/bfr-1.6-perl.patch b/app-misc/bfr/files/bfr-1.6-perl.patch
new file mode 100644
index 000000000000..b2483fd54eb8
--- /dev/null
+++ b/app-misc/bfr/files/bfr-1.6-perl.patch
@@ -0,0 +1,28 @@
+--- old/bfr.pod 2004-03-03 15:38:53.000000000 +0100
++++ new/bfr.pod 2014-10-12 06:53:49.011697801 +0200
+@@ -176,8 +176,12 @@
+
+ =back
+
++=back
++
+ =head2 BUFPLAY SPECIFIC OPTIONS
+
++=over 2
++
+ =item
+
+ B<-s> | B<--speed>
+@@ -226,8 +230,12 @@
+
+ =back
+
++=back
++
+ =head2 DEBUG SPECIFIC OPTIONS
+
++=over 2
++
+ =item
+
+ B<-d> | B<--debug>
diff --git a/app-misc/bfr/metadata.xml b/app-misc/bfr/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/bfr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/bgrep-0_p20110121 b/app-misc/bgrep-0_p20110121
deleted file mode 100644
index 43387c888c56..000000000000
--- a/app-misc/bgrep-0_p20110121
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=test? ( dev-lang/perl )
-DESCRIPTION=grep-like tool to search for binary strings
-EAPI=4
-HOMEPAGE=https://github.com/tmbinc/bgrep/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tmbinc/bgrep/tarball/49b098be9548d174023ad05c10f6af9d02b8e18e -> tmbinc-bgrep-49b098b.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1d271ea410e225670dbb28a89ceafb7a
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
new file mode 100644
index 000000000000..4c1a99d70f9e
--- /dev/null
+++ b/app-misc/bgrep/Manifest
@@ -0,0 +1,3 @@
+DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
+EBUILD bgrep-0_p20110121.ebuild 802 BLAKE2B 761e1c90982e7f28dfbdc7bc7a50502c5bb281da5040e2a5862cda1074fdfeb9fd2cb41f07a78c6580aabbc7c61cd80ea8c44a97125123151821fdaeedbddf95 SHA512 80116928aed3848cc394c084ee948e15ef9c95bb3ff8ae32ce34edeaa1459ba0eb2bb575ba95b8d13366599edfcb594b07ca741ab0fff94e587c0af30f4e7ddf
+MISC metadata.xml 220 BLAKE2B 3266a815602daa2a9da84d288e47e3328b40c967d40a801ac459539c015dbbaabe39c76945bcfe08b6499b05a2f775ea3b3094dccfeed7b62b4644f26ea4185f SHA512 be16f2417515008d47237f4a9de2584a23d02c4f7805b7b14887032db3ea5a9f6b1d6eabef07e415307f18ac4a1c08565a068a55cab9167532c0080395f207bd
diff --git a/app-misc/bgrep/bgrep-0_p20110121.ebuild b/app-misc/bgrep/bgrep-0_p20110121.ebuild
new file mode 100644
index 000000000000..c40227345447
--- /dev/null
+++ b/app-misc/bgrep/bgrep-0_p20110121.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+GITHUB_USER="tmbinc"
+GITHUB_HASH="49b098be9548d174023ad05c10f6af9d02b8e18e"
+MY_P="${GITHUB_USER}-${PN}-${GITHUB_HASH:0:7}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="grep-like tool to search for binary strings"
+HOMEPAGE="https://github.com/tmbinc/bgrep/"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${GITHUB_HASH} -> ${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE="test"
+
+RDEPEND=""
+DEPEND="test? ( dev-lang/perl )"
+
+src_prepare() {
+ sed -i -e "s|/tmp/|${T}/|g" \
+ test/bgrep-test.sh || die
+}
+
+src_compile() {
+ tc-export CC
+ emake || die
+}
+
+src_test() {
+ cd test
+ ./bgrep-test.sh || die
+}
+
+src_install() {
+ dobin bgrep
+ dodoc README
+}
diff --git a/app-misc/bgrep/metadata.xml b/app-misc/bgrep/metadata.xml
new file mode 100644
index 000000000000..961705194bb8
--- /dev/null
+++ b/app-misc/bgrep/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">tmbinc/bgrep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/bijiben-3.24.2 b/app-misc/bijiben-3.24.2
deleted file mode 100644
index 68626b8b015f..000000000000
--- a/app-misc/bijiben-3.24.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2 >=app-misc/tracker-1:= sys-apps/util-linux app-text/yelp-tools dev-libs/appstream-glib dev-util/gdbus-codegen >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Note editor designed to remain simple to use
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Bijiben
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2 >=app-misc/tracker-1:= sys-apps/util-linux
-SLOT=0
-SRC_URI=mirror://gnome/sources/bijiben/3.24/bijiben-3.24.2.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=325f1dd053c834c1f6fa8db4b9552dbe
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
new file mode 100644
index 000000000000..62c3d54ed6f7
--- /dev/null
+++ b/app-misc/bijiben/Manifest
@@ -0,0 +1,3 @@
+DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
+EBUILD bijiben-3.24.2.ebuild 746 BLAKE2B 7412677816ed6c312d161368aaad02a409b0305ae7bb18146f490cb76026bbfd09c65a77e8fa7725afa85e938ac7289856e608905df8bf4d5e21f68233a6fc34 SHA512 d46b0891c5fa2c9268f8f667be70bb9a95b7fa7df75b090837d7cf1f156df09977ba1879b139f1a913324da3bac70f84328c5d8a21c415e5c16323ddc5f4142d
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.24.2.ebuild b/app-misc/bijiben/bijiben-3.24.2.ebuild
new file mode 100644
index 000000000000..d256e6bbbd16
--- /dev/null
+++ b/app-misc/bijiben/bijiben-3.24.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# XXX: raise glib dependency when Gnome 3.26 enters tree
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=x11-libs/gtk+-3.11.4:3
+ >=gnome-extra/evolution-data-server-3.13.90:=
+ >=net-libs/webkit-gtk-2.10.0:4
+ net-libs/gnome-online-accounts:=
+ dev-libs/libxml2
+ >=app-misc/tracker-1:=
+ sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+"
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-misc/bijiben/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/binclock-1.5 b/app-misc/binclock-1.5
deleted file mode 100644
index b1aeeed471b0..000000000000
--- a/app-misc/binclock-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Displays a binary clock in your terminal
-EAPI=6
-HOMEPAGE=http://www.ngolde.de/binclock/
-KEYWORDS=alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.ngolde.de/download/binclock-1.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ded41700dac66d977145d6d538d4e83
diff --git a/app-misc/binclock/Manifest b/app-misc/binclock/Manifest
new file mode 100644
index 000000000000..13ca25acb435
--- /dev/null
+++ b/app-misc/binclock/Manifest
@@ -0,0 +1,4 @@
+AUX binclock-1.5-Makefile.patch 479 BLAKE2B 72cb38107301d133e6c17f43f5b3cb35d9401d6c41712603e3c8c6231c4ea560e3e24958ab46a1a9878272ddbcb6ce7cb82e64d2716736eae2b5e4007078e209 SHA512 7f120eeed63f27753875c7a4b8924f5db9bfc9c5048d414c1e5de7f53cf36138bfc185843e14292c9f47e87e2aeec1fd08a31254f7ac0716e4549588776fc773
+DIST binclock-1.5.tar.gz 12301 BLAKE2B 598185f21d257bd02cd4d91e0ddc707d5eaa9ff52160bd9af0d8d50238fe6ca134952bfc99d285568b77c747ec388ed7e23e3c4bac0fec5fd150e34e55687ed3 SHA512 f3650c8befb999a7e6261bc72ee4f81be670fe95899efc742112102c4107ebbbb25d015d57a702630ce2104cf8c738953c7fe70f24814514d8a2705240000e75
+EBUILD binclock-1.5.ebuild 643 BLAKE2B 7742dbc447638df9bac3260dafbe86eeed5a5e8efc6f6cfec435a970b978c9ad49f4c93f98ca2103456cc0ed96fc2d61b8696295e264cf7ddeb0736e86d405ef SHA512 d9b9a5878ce902b8c56812a0f290a47f33441b435c94b68fb5343096baf02daa41d1dbfbc68db345e09be62be1730dd5b0f8ab2648adc168f133baacf22dbdf0
+MISC metadata.xml 352 BLAKE2B 27cde27260dedf58780e1e1a2d53eababedd9d5166a2894ba4de8c50ecf78f3367c40e9fdcd4d8e55109bee2e6f371d5cb90ca57884dee5aca45845109d986c1 SHA512 f4fb925a021543b198c3fb8d4a53e5d1c5450fd7f49cd76c99d9252e1c52747359c327fa99ea3a1a8882d51949b298c39c368049f86b7890c84dccaa6746226c
diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5.ebuild
new file mode 100644
index 000000000000..0c4db18b0aad
--- /dev/null
+++ b/app-misc/binclock/binclock-1.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Displays a binary clock in your terminal"
+HOMEPAGE="http://www.ngolde.de/binclock/"
+SRC_URI="http://www.ngolde.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=sys-apps/sed-4"
+
+PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" )
+
+src_configure() {
+ append-cflags -Wall -pedantic
+ tc-export CC
+}
+
+src_install() {
+ dobin binclock
+ doman doc/binclock.1
+ dodoc CHANGELOG README binclockrc
+}
diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch
new file mode 100644
index 000000000000..15a510186b55
--- /dev/null
+++ b/app-misc/binclock/files/binclock-1.5-Makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile 2018-05-29 10:18:47.795059054 -0400
++++ b/Makefile 2018-05-29 10:21:37.126740904 -0400
+@@ -18,8 +18,6 @@
+ # Boston, MA 02111-1307, USA
+ #
+
+-CC = gcc
+-CFLAGS = -O2 -Wall --pedantic
+ BIN = binclock
+ SRC = ./src/binclock.c
+ INSPATH = /usr/local/bin/
+@@ -28,8 +26,8 @@
+ CONF = /etc/
+
+ all : $(MAINSRC)
+- $(CC) $(CFLAGS) -o $(BIN) $(SRC)
+- strip $(SOURCEPATH)$(BIN)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN) $(SRC)
++ true $(SOURCEPATH)$(BIN)
+
+ install :
+
diff --git a/app-misc/binclock/metadata.xml b/app-misc/binclock/metadata.xml
new file mode 100644
index 000000000000..0ca0fe608d0d
--- /dev/null
+++ b/app-misc/binclock/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription>binclock displays a binary clock in your terminal.</longdescription>
+</pkgmetadata>
diff --git a/app-misc/binwalk-2.1.1 b/app-misc/binwalk-2.1.1
deleted file mode 100644
index e45f32cceab3..000000000000
--- a/app-misc/binwalk-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool for identifying files embedded inside firmware images
-EAPI=6
-HOMEPAGE=https://github.com/devttys0/binwalk
-IUSE=graph python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) graph? ( dev-python/pyqtgraph[opengl,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/devttys0/binwalk/archive/v2.1.1.tar.gz -> binwalk-2.1.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6b85d4b3636c19aff5bbb96b90d1a0f
diff --git a/app-misc/binwalk-9999 b/app-misc/binwalk-9999
deleted file mode 100644
index cdc0826ed8d0..000000000000
--- a/app-misc/binwalk-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A tool for identifying files embedded inside firmware images
-EAPI=6
-HOMEPAGE=https://github.com/devttys0/binwalk
-IUSE=graph python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) graph? ( dev-python/pyqtgraph[opengl,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 git-r3 8f6de46b0aa318aea0e8cac62ece098b multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78c8c0a735240e71cda9a8127cf6e8f6
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
new file mode 100644
index 000000000000..3c783d753a71
--- /dev/null
+++ b/app-misc/binwalk/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
+DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
+EBUILD binwalk-2.1.1.ebuild 1110 BLAKE2B 91138bcad83793cbafed2da690706491f2e4481e35b740123da388b48502a678eefe3d85113ee9500ab85d6dec5639d3efd3153216af78d0dcfcfbe78579aac4 SHA512 77585899a0f0cb775376ea767f4b5f1ae8f6bacebc6d2df7ec4b6a4eb3a293ba3817a6c63be6e3714f386ddec685c921255f806058954f00e0cf56bb15a76f4a
+EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2b1209d4211d85d9e2b7250234777b81c308a4551f21a2caa91c0dc325ea64034b7e670fcc9f836b3308d83c798a5f3b58b4c260e08b89fd6f78a8470364ecc2 SHA512 ec0c1b3954b6ec60982266666e3a64e989a1cd87f58451df7f2622cd8116b36fb66831bea034eca6dcdba6bba7ae5dada6fe86733150da62d79cc9c72d1acc57
+MISC metadata.xml 1043 BLAKE2B 3c31b5153464d9c439fdcab70b47aeccce5d0a8ec4acb57bf519830b80915bfe3e38dc0d995fc875f5b217bb354bc250043684188a2fc7988948039761204c2e SHA512 4f8c75bff33aee8f04748e52a6c13a866c08b1e0a9e4ff47fa5ccbf2a4e203e1324c6571edc57ce7713a1fc18af3f6d68645a725df84530aab03cf6f87dda5bc
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
new file mode 100644
index 000000000000..fd5e23c75834
--- /dev/null
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/devttys0/binwalk.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86 ~x64-macos"
+fi
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="https://github.com/devttys0/binwalk"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="graph"
+
+RDEPEND="
+ $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)
+ graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch )
+
+python_install_all() {
+ local DOCS=( API.md INSTALL.md README.md )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "binwalk has many optional dependencies to automatically"
+ elog "extract/decompress data, see INSTALL.md for more details."
+ fi
+}
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
new file mode 100644
index 000000000000..4e8eaf67d0ef
--- /dev/null
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/devttys0/binwalk.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="https://github.com/devttys0/binwalk"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="graph"
+
+RDEPEND="
+ $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7)
+ graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
+"
+
+python_install_all() {
+ local DOCS=( API.md INSTALL.md README.md )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "binwalk has many optional dependencies to automatically"
+ elog "extract/decompress data, see INSTALL.md for more details."
+ fi
+}
diff --git a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
new file mode 100644
index 000000000000..708498060bc7
--- /dev/null
+++ b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
@@ -0,0 +1,67 @@
+From 95bce4edcc6e92c9517b80ccb1fb956f591e0738 Mon Sep 17 00:00:00 2001
+From: Craig Heffner <heffnercj@gmail.com>
+Date: Tue, 5 Jan 2016 13:28:24 -0500
+Subject: [PATCH] Added check for backports.lzma when importing lzma module
+
+---
+ src/binwalk/modules/compression.py | 5 ++++-
+ src/binwalk/plugins/lzmaextract.py | 6 +++++-
+ src/binwalk/plugins/lzmavalid.py | 5 ++++-
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/binwalk/modules/compression.py b/src/binwalk/modules/compression.py
+index 97ca68d..e919f7e 100644
+--- a/src/binwalk/modules/compression.py
++++ b/src/binwalk/modules/compression.py
+@@ -2,11 +2,14 @@
+
+ import os
+ import zlib
+-import lzma
+ import struct
+ import binwalk.core.compat
+ import binwalk.core.common
+ from binwalk.core.module import Option, Kwarg, Module
++try:
++ import lzma
++except ImportError:
++ from backports import lzma
+
+ class LZMAHeader(object):
+ def __init__(self, **kwargs):
+diff --git a/src/binwalk/plugins/lzmaextract.py b/src/binwalk/plugins/lzmaextract.py
+index 137b4cc..93f6240 100755
+--- a/src/binwalk/plugins/lzmaextract.py
++++ b/src/binwalk/plugins/lzmaextract.py
+@@ -12,7 +12,11 @@ class LZMAExtractPlugin(binwalk.core.plugin.Plugin):
+ # lzma package in Python 2.0 decompress() does not handle multiple
+ # compressed streams, only first stream is extracted.
+ # backports.lzma package could be used to keep consistent behaviour.
+- import lzma
++ try:
++ import lzma
++ except ImportError:
++ from backports import lzma
++
+ self.decompressor = lzma.decompress
+
+ # If the extractor is enabled for the module we're currently loaded
+diff --git a/src/binwalk/plugins/lzmavalid.py b/src/binwalk/plugins/lzmavalid.py
+index a343656..62e15b9 100644
+--- a/src/binwalk/plugins/lzmavalid.py
++++ b/src/binwalk/plugins/lzmavalid.py
+@@ -17,7 +17,10 @@ class LZMAPlugin(binwalk.core.plugin.Plugin):
+
+ def init(self):
+ try:
+- import lzma
++ try:
++ import lzma
++ except ImportError:
++ from backports import lzma
+ self.decompressor = lzma.decompress
+ except ImportError as e:
+ self.decompressor = None
+--
+2.12.2
+
diff --git a/app-misc/binwalk/metadata.xml b/app-misc/binwalk/metadata.xml
new file mode 100644
index 000000000000..9cd3f7b9f5c1
--- /dev/null
+++ b/app-misc/binwalk/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <longdescription lang="en">
+ Binwalk is a tool for searching a given binary image for embedded files.
+ Specifically, it is designed for identifying files embedded inside of firmware
+ images. Binwalk uses the libmagic library, so it is compatible with magic
+ signatures created for the Unix file utility.
+ Binwalk also includes a custom magic signature file which contains improved
+ signatures for files that are commonly found in firmware images such as
+ compressed/archived files, firmware headers, Linux kernels, bootloaders,
+ filesystems, etc.
+ </longdescription>
+ <upstream>
+ <remote-id type="google-code">binwalk</remote-id>
+ <remote-id type="github">devttys0/binwalk</remote-id>
+ </upstream>
+ <use>
+ <flag name="graph">Enable support for generating entropy graphs</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/birthday-1.6.2-r1 b/app-misc/birthday-1.6.2-r1
deleted file mode 100644
index 69081069811e..000000000000
--- a/app-misc/birthday-1.6.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile prepare
-DESCRIPTION=Displays a list of events happening in the near future
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/birthday/
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/birthday/birthday-1.6.2.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7711cf81267d29006bcdcdfb5c5c3a7f
diff --git a/app-misc/birthday/Manifest b/app-misc/birthday/Manifest
new file mode 100644
index 000000000000..34d3df0c9d96
--- /dev/null
+++ b/app-misc/birthday/Manifest
@@ -0,0 +1,3 @@
+DIST birthday-1.6.2.tar.bz2 85617 BLAKE2B bb922b4dbec35e967f5b0060a13b5429fe01478159ab930e2924dc0d397c47c265384f71dac63bb0f3bb609a0c98099529680c8d097b747d857086d885d9bb4b SHA512 5081cd9f875260758d209165803715d3eb19e2256344172cb3ea01f87f859215ce68e29174c22eec467bdb6eebc11627a71674321bb9b96db9562d13cdc80882
+EBUILD birthday-1.6.2-r1.ebuild 698 BLAKE2B 220a91286514a2b206e5ed2d95c388b93871100d8cb95ca9dcf7d3117aaac1590bffaf7b157e0a5f26f881dcf04f1489037725737e0a15486e59a9f7e1b45fd1 SHA512 2f09d307d9bf11a212125ca7c302c86a90ab6c524ee1709bf2fbb669fecff090519fd917038ba6cd2f7d40a0d07fd8eb8de4d3edb4923d8d177b8cc8bb06f307
+MISC metadata.xml 343 BLAKE2B da9301a517150bf8a7526d0561bae8de1f16658f751a3d64f471058877e832d3e625bd85440a1bd2c5fc015099170f2b2e34bd7084b8719f454280871317feae SHA512 1090fa6925bc056aba45841ccfdd8df241414eb187cb7a8d95379a65c3ef950849cf9e42d8f4dac1d44d2e7ae65f51d9498cee5e523a535ece88e553a75a1261
diff --git a/app-misc/birthday/birthday-1.6.2-r1.ebuild b/app-misc/birthday/birthday-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..94556795d5e8
--- /dev/null
+++ b/app-misc/birthday/birthday-1.6.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Displays a list of events happening in the near future"
+HOMEPAGE="https://sourceforge.net/projects/birthday/"
+SRC_URI="mirror://sourceforge/birthday/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+src_prepare() {
+ # Don't strip, install in correct share dir and respect CFLAGS
+ sed \
+ -e "s:install -s:install:g" -e "s:#SHARE:SHARE:g" -e "s:-O2:${CFLAGS}:g" \
+ -i Makefile || die
+ sed \
+ -e 's:grep -v:grep --binary-files=text -v:g' \
+ -i runtest.sh || die
+
+ default
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
diff --git a/app-misc/birthday/metadata.xml b/app-misc/birthday/metadata.xml
new file mode 100644
index 000000000000..6461f9f10b33
--- /dev/null
+++ b/app-misc/birthday/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">birthday</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/blink1-1.98 b/app-misc/blink1-1.98
deleted file mode 100644
index bfae79191aa0..000000000000
--- a/app-misc/blink1-1.98
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=dev-libs/hidapi virtual/libusb:1 virtual/libudev sys-apps/attr sys-libs/libcap virtual/pkgconfig
-DESCRIPTION=blink(1) USB RGB LED status light control suite
-EAPI=6
-HOMEPAGE=https://blink1.thingm.com/
-IUSE=doc examples +tool mini-tool server kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0
-RDEPEND=dev-libs/hidapi virtual/libusb:1 virtual/libudev sys-apps/attr sys-libs/libcap
-SLOT=0
-SRC_URI=https://github.com/todbot/blink1/archive/v1.98.tar.gz -> blink1-1.98.tar.gz
-_eclasses_=eapi7-ver d97a56a62c7df8614afddcb25f5ff00f linux-info 8e77ea4def23d38cdf0e8ffa69187d34 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0e05d4308b6ed358e6649515a2b7e163
diff --git a/app-misc/blink1/Manifest b/app-misc/blink1/Manifest
new file mode 100644
index 000000000000..61c4b9e37163
--- /dev/null
+++ b/app-misc/blink1/Manifest
@@ -0,0 +1,3 @@
+DIST blink1-1.98.tar.gz 29439933 BLAKE2B 5c775819c9401c04e1c9adeb3dcb1f524ed30b6493380368b063a6ef94af75ab30e8b7f43e1b195f17578a1625bc6118bd65c7402376560ab5ee00e80f0c5c04 SHA512 2057e3ccf149dbdaaea2d09dabaa95317125d65151dc79c675365f55e85a3d0988232fd5ff404bdcfd127ebc266495afa04fb1b3fd0e4ac931bb711b0bb63568
+EBUILD blink1-1.98.ebuild 2580 BLAKE2B a68e99cb39c1d183b2802dfce524e807db614d43c6ae22cb1b177b77657b016a5c0fa6c273ec4c6eafa4147c80278feba265dd85aa564f506fd7d915d1e2fd0c SHA512 5675d112620eed4d8647203c52671e0b24a87678c070858828375e84086a3f7959958ce144b921d94e79d28518885e71d159922592de980eb712ee75ade7d950
+MISC metadata.xml 579 BLAKE2B 1644cacb6985bbe68c7cdcdaaa5f602fdd79c63c8e3b54ad34b6d97e9c50415ff9d343ab60b9c91bade52b2f59b34e4b0488a091001cb36ba294e0a29ff1b90f SHA512 a848eee9c39a574515aa6a5b70f347960a4c117583e58e2a31b3c714fb91347061518f96b2c8f13cb9167afd9e5478a4c76717af10a5ad5fc084a82fc47a9f7e
diff --git a/app-misc/blink1/blink1-1.98.ebuild b/app-misc/blink1/blink1-1.98.ebuild
new file mode 100644
index 000000000000..db7709ef64d0
--- /dev/null
+++ b/app-misc/blink1/blink1-1.98.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info
+
+DESCRIPTION="blink(1) USB RGB LED status light control suite"
+HOMEPAGE="https://blink1.thingm.com/"
+
+## github release tarball
+MY_PV=${PV/_rc/rc}
+MY_P="${PN}-${MY_PV}"
+SRC_URI="https://github.com/todbot/blink1/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+## selfmade tarball
+#MY_PVR=${PVR/_rc/rc}
+#MY_P="${PN}-${MY_PVR}"
+#SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"
+
+## github commit tarball
+#MY_GIT_COMMIT="1e9c012bd79cb99a53a22980fbaa6f97801e7c03"
+#MY_P="todbot-${PN}-${MY_GIT_COMMIT:0:7}"
+#SRC_URI="https://github.com/todbot/${PN}/tarball/${MY_GIT_COMMIT} -> ${PF}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="CC-BY-SA-3.0"
+IUSE="doc examples +tool mini-tool server"
+
+RDEPEND="dev-libs/hidapi
+ virtual/libusb:1
+ virtual/libudev
+ sys-apps/attr
+ sys-libs/libcap"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_setup() {
+ ## check for USB HID kernel support
+ linux-info_pkg_setup
+ CONFIG_CHECK="USB_HID"
+ check_extra_config
+ ## check for acceptable USE flag settings
+ if ! ( use tool || use mini-tool || use server ); then
+ eerror "At least one of the following USE flags must be enabled:"
+ eerror "tool, mini-tool, server"
+ die "unacceptable USE flag settings"
+ fi
+}
+
+src_compile() {
+ if use tool; then
+ pushd commandline &>/dev/null
+ # USBLIB_TYPE=HIDAPI
+ # USBLIB_TYPE=HIDAPI_HIDRAW
+ # USBLIB_TYPE=HIDDATA
+ emake OS=linux USBLIB_TYPE=HIDAPI blink1-tool || die "emake blink1-tool failed"
+ popd &>/dev/null
+ fi
+ if use mini-tool; then
+ pushd commandline/blink1-mini-tool &>/dev/null
+ emake OS=linux blink1-mini-tool || die "emake blink1-mini-tool failed"
+ popd &>/dev/null
+ fi
+ if use server; then
+ pushd commandline &>/dev/null
+ emake OS=linux blink1-tiny-server || die "emake blink1-tiny-server failed"
+ popd &>/dev/null
+ fi
+}
+
+src_install() {
+ if use doc; then
+ dodoc docs/README.md
+ fi
+ if use tool; then
+ if use doc; then
+ dodoc docs/{blink1-tool.md,blink1-tool-tips.md,blink1-hid-commands.md,blink1-mk2-tricks.md}
+ fi
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins commandline/scripts/{README.md,blink1-*.sh}
+ docompress -x /usr/share/doc/"${PF}"/examples
+ fi
+ dobin commandline/blink1-tool
+ fi
+ if use mini-tool; then
+ dobin commandline/blink1-mini-tool/blink1-mini-tool
+ fi
+ if use server; then
+ if use doc; then
+ dodoc docs/{app-url-api.md,app-url-api-examples.md}
+ fi
+ dobin commandline/blink1-tiny-server
+ fi
+}
diff --git a/app-misc/blink1/metadata.xml b/app-misc/blink1/metadata.xml
new file mode 100644
index 000000000000..3b8c7475c606
--- /dev/null
+++ b/app-misc/blink1/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">todbot/blink1</remote-id>
+ </upstream>
+ <use>
+ <flag name="tool">Build and install command-line tool blink1-tool</flag>
+ <flag name="mini-tool">Build and install command-line mini-tool blink1-mini-tool (normally used for embedded devices)</flag>
+ <flag name="server">Build and install REST API server (currently hard-coded to TCP port 8080)</flag>
+ </use>
+</pkgmetadata>
+
diff --git a/app-misc/bottlerocket-0.04c-r1 b/app-misc/bottlerocket-0.04c-r1
deleted file mode 100644
index cdfec5e1dd0b..000000000000
--- a/app-misc/bottlerocket-0.04c-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DESCRIPTION=CLI interface to the X-10 Firecracker Kit
-EAPI=2
-HOMEPAGE=http://www.linuxha.com/bottlerocket/
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=http://www.linuxha.com/bottlerocket/bottlerocket-0.04c.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=76890f92436d02518e44bd1f6e11aebb
diff --git a/app-misc/bottlerocket/Manifest b/app-misc/bottlerocket/Manifest
new file mode 100644
index 000000000000..daefc9962c86
--- /dev/null
+++ b/app-misc/bottlerocket/Manifest
@@ -0,0 +1,3 @@
+DIST bottlerocket-0.04c.tar.gz 40533 BLAKE2B d42adfc40194cde1229f6e20a3ceed3115d1e1b41789b51f508edc09d12525f6e702c470f38aa94c95d9987b986f467a7723e65f616cbfdfdfa12a05096ea932 SHA512 37673bd9a519307f0ae3003f3a458dbb99d4fd0c96ebaa664f4967fe45b20c1132828c3c7a31e769157e6034c43c9cdcd1ecac8c6791812d2a04e93d4c0c6888
+EBUILD bottlerocket-0.04c-r1.ebuild 881 BLAKE2B 3ca7e8421209e09396cce6b84197fa2bec3cd76b242176dc94c2eb3ba6f4faffdf66cdc2173f734d7139ca815920b2c4d43a10613297b5eecc2be59da96e988d SHA512 1b022113885a17a16c3ff555cdad77b4f498b8b4eced10f9636998883c0cd046f813bea88d51bf19d4a096a19c475079a3ea97d286e1419f39d7ae73966dc33f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild b/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild
new file mode 100644
index 000000000000..4bebb91dd777
--- /dev/null
+++ b/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="CLI interface to the X-10 Firecracker Kit"
+HOMEPAGE="http://www.linuxha.com/bottlerocket/"
+SRC_URI="http://www.linuxha.com/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+src_prepare() {
+ # inset LDFLAGS
+ sed -i Makefile.in \
+ -e 's| -O2 ||g' \
+ -e '/ -o br /s|${CFLAGS}|& $(LDFLAGS)|g' \
+ || die "sed Makefile.in"
+}
+
+src_configure() {
+ econf --with-x10port=/dev/firecracker
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+ einstall || die "einstall"
+ dodoc README
+}
+
+pkg_postinst() {
+ elog
+ elog "Be sure to create a /dev/firecracker symlink to the"
+ elog "serial port that has the Firecracker serial interface"
+ elog "installed on it."
+ elog
+}
diff --git a/app-misc/bottlerocket/metadata.xml b/app-misc/bottlerocket/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/bottlerocket/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/boxes-1.1.2-r1 b/app-misc/boxes-1.1.2-r1
deleted file mode 100644
index b18b4defdd0d..000000000000
--- a/app-misc/boxes-1.1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=Draw any kind of boxes around your text
-EAPI=5
-HOMEPAGE=http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/ascii-boxes/boxes/archive/v1.1.2.tar.gz -> boxes-1.1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eaa6c743e0cb4c8ba1095124bf3ee199
diff --git a/app-misc/boxes-1.1.2-r2 b/app-misc/boxes-1.1.2-r2
deleted file mode 100644
index 03b20245368c..000000000000
--- a/app-misc/boxes-1.1.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=Draw any kind of boxes around your text
-EAPI=5
-HOMEPAGE=http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/ascii-boxes/boxes/archive/v1.1.2.tar.gz -> boxes-1.1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e22f05ee46bce59f4d8b6fb4678b4bc
diff --git a/app-misc/boxes-1.1.2-r3 b/app-misc/boxes-1.1.2-r3
deleted file mode 100644
index 576ad7142b9f..000000000000
--- a/app-misc/boxes-1.1.2-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/flex sys-devel/bison
-DESCRIPTION=Draw any kind of boxes around your text
-EAPI=6
-HOMEPAGE=http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/ascii-boxes/boxes/archive/v1.1.2.tar.gz -> boxes-1.1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54dfbb39f3ce07771ebb9f30f2e5dfd5
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
new file mode 100644
index 000000000000..4a2156d812cc
--- /dev/null
+++ b/app-misc/boxes/Manifest
@@ -0,0 +1,5 @@
+DIST boxes-1.1.2.tar.gz 101658 BLAKE2B 002cd1a458d39069cf0955fc37c05e60590003ac987619d89851b3943cdaca986b57e631081a196e7c9a2a245397e72f8c882fb6e190c0127289602ead223a7b SHA512 10efb5f62d94003532e2f32d6a0f7c76dd86c7cfaf150f35c24516dc6684f5e3909ecd5fd48c1c64f25f874cb1364bdf3d959a2fb837bfe74c2d879a35f443dd
+EBUILD boxes-1.1.2-r1.ebuild 861 BLAKE2B d53ffa33ec9f1617908e1206c079ff51cd58993c3e1ce65bc61f40807c914f92e14e22771741979c2bcdbd268273e997a172f17fab3c607776cdba2f01beb661 SHA512 c528b010b53d79d63eb9c5094975e86134960c606030577be41f1d18238b2d1104d2e8ed795b87710f103af00015ed5b0eb7b05af5503382d69c5da8fd7cc013
+EBUILD boxes-1.1.2-r2.ebuild 869 BLAKE2B 5f3bd74b15f2d94d34001195d5c1856e98ad1056c51b25a82ab745fddaa7467ebd00aab5d39eb9719bb64ab3dc9b68cd74791e8f5593d6dc782123c648ab2817 SHA512 93ae9c4536ccae41faf5d0e7635a1071b44b97cebb82e243caa6661ba5ce2537f4bbc8e6617fb822c0545c661d0d99a05d4acfc72199a45adaf836e0afb1fc23
+EBUILD boxes-1.1.2-r3.ebuild 865 BLAKE2B de22a3d24051526bbf7d6b8cab6d900c37cddc769c40e63da62f5d45c77137aec3cf1d8f63fd4b3ba277e75da9b63ba020c16ddc80e7a73ad619ab4175948953 SHA512 81690b190e92686877552b49ad1e0d974b74b6e822cf6c101b4e5de85c7b256be6b00a4e3fbf6f04c09f0e3e328aeac4d941bdef33f78bdfaf935895103d554f
+MISC metadata.xml 357 BLAKE2B ce56f6092cc7e6a1509a1be7627f92c543e64274915bdfaab74a03bb64c230b586c939a1fee654a1d81774076e35c9651e90b73d262330fae7b4320a31693af2 SHA512 37d5831d4633bd9f5d3d113841f6300adb8945827fd113bb9366181e11bd0234f7804f7bbb1b930e40a5a0a55e402b4561c8765d9d747100021c2e4ec5ba2074
diff --git a/app-misc/boxes/boxes-1.1.2-r1.ebuild b/app-misc/boxes/boxes-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..396033fe7e9d
--- /dev/null
+++ b/app-misc/boxes/boxes-1.1.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Draw any kind of boxes around your text"
+HOMEPAGE="http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ "
+
+src_prepare() {
+ append-cflags -Iregexp -I. -ansi -std=c99
+ append-ldflags -Lregexp
+ sed \
+ -e 's:STRIP=true:STRIP=false:g' \
+ -i src/Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin src/boxes
+ doman doc/boxes.1
+ dodoc README.md
+ insinto /usr/share/boxes
+ doins boxes-config
+}
diff --git a/app-misc/boxes/boxes-1.1.2-r2.ebuild b/app-misc/boxes/boxes-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..78245bb48fea
--- /dev/null
+++ b/app-misc/boxes/boxes-1.1.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Draw any kind of boxes around your text"
+HOMEPAGE="http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ "
+
+src_prepare() {
+ append-cflags -Iregexp -I. -ansi -std=c99
+ append-ldflags -Lregexp
+ sed \
+ -e 's:STRIP=true:STRIP=false:g' \
+ -i src/Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin src/boxes
+ doman doc/boxes.1
+ dodoc README.md
+ insinto /usr/share
+ newins boxes-config boxes
+}
diff --git a/app-misc/boxes/boxes-1.1.2-r3.ebuild b/app-misc/boxes/boxes-1.1.2-r3.ebuild
new file mode 100644
index 000000000000..737c507427ac
--- /dev/null
+++ b/app-misc/boxes/boxes-1.1.2-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Draw any kind of boxes around your text"
+HOMEPAGE="http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ sys-devel/flex
+ sys-devel/bison"
+
+src_prepare() {
+ default
+ append-cflags -Iregexp -I. -ansi -std=c99
+ append-ldflags -Lregexp
+ sed \
+ -e 's:STRIP=true:STRIP=false:g' \
+ -i src/Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin src/boxes
+ doman doc/boxes.1
+ insinto /usr/share
+ newins boxes-config boxes
+ einstalldocs
+}
diff --git a/app-misc/boxes/metadata.xml b/app-misc/boxes/metadata.xml
new file mode 100644
index 000000000000..3ec0f95910a9
--- /dev/null
+++ b/app-misc/boxes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ascii-boxes/boxes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/brewtarget-2.3.1 b/app-misc/brewtarget-2.3.1
deleted file mode 100644
index fc71672acc64..000000000000
--- a/app-misc/brewtarget-2.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Application to create and manage beer recipes
-EAPI=6
-HOMEPAGE=http://www.brewtarget.org/
-KEYWORDS=~amd64
-LICENSE=GPL-3 WTFPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=https://github.com/Brewtarget/brewtarget/releases/download/v2.3.1/brewtarget_2.3.1.orig.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3757372b4d1aa8dd315df90d700fecd4
diff --git a/app-misc/brewtarget/Manifest b/app-misc/brewtarget/Manifest
new file mode 100644
index 000000000000..ebce77bd9185
--- /dev/null
+++ b/app-misc/brewtarget/Manifest
@@ -0,0 +1,3 @@
+DIST brewtarget_2.3.1.orig.tar.xz 9449200 BLAKE2B 00eda709c6665b2353380d013d55a59068d79f70368e843296f43d2f947c741ed526d4f6820f18c4d5e96866274bce76b2235cc50595882f58f397f651858bf3 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086
+EBUILD brewtarget-2.3.1.ebuild 1246 BLAKE2B 401e5003db8a39362ea5206563236c45addadfa5922571dd3d0a74bc7e8ca8b62a48ad74d6b63ae7a8a4f56235e100132c36014ad5f86c7f431fbe1f680852dc SHA512 b6409e126ed6e94d0511f08749c56e5a4e774ddacdc6ccf64ca5ce68c27502a5a8b6eb37118301bec44396664b2754d2e76c072879623d2f675d2cc12e0bcc30
+MISC metadata.xml 333 BLAKE2B 610f70294511d47c0df2cbd259fbe558b6f90350f619984e732bc1d3b3977c22fff55ab110da945164baa76ccc4c39bcbf347e29fea175ce3f390c41f4fbc86e SHA512 e51f8f143455d51148898350c95b321226c7bd931a585234bce000cf1b2f2762b465f2af764288cc4ddde13abf825f8571e4a6ed7f9e73fbb315030d51cb45aa
diff --git a/app-misc/brewtarget/brewtarget-2.3.1.ebuild b/app-misc/brewtarget/brewtarget-2.3.1.ebuild
new file mode 100644
index 000000000000..320d5b9daa7c
--- /dev/null
+++ b/app-misc/brewtarget/brewtarget-2.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Application to create and manage beer recipes"
+HOMEPAGE="http://www.brewtarget.org/"
+SRC_URI="https://github.com/Brewtarget/${PN}/releases/download/v${PV}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-3 WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+remove_locale() {
+ sed -i -e "/bt_${1}\.ts/d" CMakeLists.txt || die
+}
+
+src_prepare() {
+ l10n_find_plocales_changes "${S}/translations" bt_ .ts
+ l10n_for_each_disabled_locale_do remove_locale
+
+ # Tests are bogus, don't build them
+ sed -i -e '/Qt5Test/d' CMakeLists.txt || die
+ sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDO_RELEASE_BUILD=ON
+ -DNO_MESSING_WITH_FLAGS=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-misc/brewtarget/metadata.xml b/app-misc/brewtarget/metadata.xml
new file mode 100644
index 000000000000..398588962207
--- /dev/null
+++ b/app-misc/brewtarget/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pesa@gentoo.org</email>
+ <name>Davide Pesavento</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Brewtarget/brewtarget</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/btail-0.3 b/app-misc/btail-0.3
deleted file mode 100644
index 4c53a5668ded..000000000000
--- a/app-misc/btail-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/gdbm
-DESCRIPTION=Bayesian logfile filter
-EAPI=4
-HOMEPAGE=http://www.vanheusden.com/btail/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/gdbm
-SLOT=0
-SRC_URI=http://www.vanheusden.com/btail//btail-0.3.tgz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=bbd13d4fe3fc85ac6294dc3f9de89551
diff --git a/app-misc/btail/Manifest b/app-misc/btail/Manifest
new file mode 100644
index 000000000000..adc1ad7159c9
--- /dev/null
+++ b/app-misc/btail/Manifest
@@ -0,0 +1,3 @@
+DIST btail-0.3.tgz 7402 BLAKE2B 4d7fb1ce1e89aca6e4ff9b45866296b40f960fad751ff211b551655fd62ef125b3c5397c165f221feaa7070530930d65c5af1a90536faea2b112664b823c19fc SHA512 1b27b6fff41b5e69119526115d5c3d239d106303923796121829729617765354cbd3f769b95c8fd32cd5a181475c3cde0ffe2accaae44ae461966df46bb990ee
+EBUILD btail-0.3.ebuild 738 BLAKE2B 7d421da8fddc845cc900911ba3595ae876e2019e3ee7ff65deb4c21c3922335515cd0d6cce89253afca13aa161acbc4a755b14a6595e422bc922c4821bebfaa8 SHA512 ad817a50faca01ffbc851511ea91558b87c571182aab2f8efdf683c5cb6e64b4bde5acecd6ab14f34262adeece7aae872c621f713bc6c3b32d1d8b976d9b48b4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/btail/btail-0.3.ebuild b/app-misc/btail/btail-0.3.ebuild
new file mode 100644
index 000000000000..7a7acc3d203f
--- /dev/null
+++ b/app-misc/btail/btail-0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bayesian logfile filter"
+HOMEPAGE="http://www.vanheusden.com/btail/"
+SRC_URI="${HOMEPAGE}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/gdbm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i Makefile \
+ -e '/^LDFLAGS/s:=:+=:g' \
+ -e '/$(CC)/s:-Wall:$(CFLAGS) &:g' \
+ || die
+ sed -i conf.cpp \
+ -e '/Configline/s:):, line):g' \
+ || die
+}
+
+src_compile() {
+ emake \
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)"
+}
+
+src_install() {
+ dobin blearn btail
+ dodoc readme.txt btail.conf license.txt
+}
diff --git a/app-misc/btail/metadata.xml b/app-misc/btail/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/btail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/byobu-5.123 b/app-misc/byobu-5.123
deleted file mode 100644
index e23435fe5339..000000000000
--- a/app-misc/byobu-5.123
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
-EAPI=6
-HOMEPAGE=http://byobu.co
-IUSE=screen python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/byobu/trunk/5.123/+download/byobu_5.123.orig.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7e0a42a01b049c46d91155c5ec6273b5
diff --git a/app-misc/byobu-5.124 b/app-misc/byobu-5.124
deleted file mode 100644
index 394095c24bad..000000000000
--- a/app-misc/byobu-5.124
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
-EAPI=6
-HOMEPAGE=http://byobu.co
-IUSE=screen python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/byobu/trunk/5.124/+download/byobu_5.124.orig.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a0eb2ed40d1e92060ed79cc820e32e12
diff --git a/app-misc/byobu-5.125 b/app-misc/byobu-5.125
deleted file mode 100644
index 38ba3f285029..000000000000
--- a/app-misc/byobu-5.125
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
-EAPI=6
-HOMEPAGE=http://byobu.co
-IUSE=screen python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/byobu/trunk/5.125/+download/byobu_5.125.orig.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=74ab63f9080466d092c7a05d4f541597
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
new file mode 100644
index 000000000000..d83398a61a0a
--- /dev/null
+++ b/app-misc/byobu/Manifest
@@ -0,0 +1,7 @@
+DIST byobu_5.123.orig.tar.gz 581421 BLAKE2B 450804be3d625c31a493edef0f398b528b5c3b21dd38bb8c9319857ead9c5bd1b5cfa01bfa190ad6fe0f5a99007ac68d068ec6082bc1fcf32c667d6035f1e296 SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059
+DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
+DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
+EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
+EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
+EBUILD byobu-5.125.ebuild 946 BLAKE2B 42fba6e3128dd545ca139484b3749c8868e96ef0062d4b48b81b462073d1f1d673d2a57ab2efffd67e0c6a7cfa647955a1fe021615e2ee13cc82d2c2e95acd66 SHA512 3fe3808e439bfddb8b5b3c393b947ec22f9ec4d965ae30ac59259fb1032328e945d2b57f010a3c84ef3ac138bde07dfecf86b76e5e618ef360bff7626cbfc7e5
+MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.123.ebuild b/app-misc/byobu/byobu-5.123.ebuild
new file mode 100644
index 000000000000..33c36ce0cdc5
--- /dev/null
+++ b/app-misc/byobu/byobu-5.123.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/newt[${PYTHON_USEDEP}]
+ screen? ( app-misc/screen )
+ !screen? ( app-misc/tmux )"
+
+src_prepare() {
+ default
+
+ python_fix_shebang .
+
+ # Set default system backend to screen
+ if use screen ; then
+ sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+ fi
+}
+
+src_install() {
+ default
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+
+ docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/byobu/byobu-5.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
new file mode 100644
index 000000000000..f67cbf99d559
--- /dev/null
+++ b/app-misc/byobu/byobu-5.124.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/newt[${PYTHON_USEDEP}]
+ screen? ( app-misc/screen )
+ !screen? ( app-misc/tmux )"
+
+src_prepare() {
+ default
+
+ python_fix_shebang .
+
+ # Set default system backend to screen
+ if use screen ; then
+ sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+ fi
+}
+
+src_install() {
+ default
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+
+ docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/byobu/byobu-5.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
new file mode 100644
index 000000000000..d3b11ec6f89f
--- /dev/null
+++ b/app-misc/byobu/byobu-5.125.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/newt[${PYTHON_USEDEP}]
+ screen? ( app-misc/screen )
+ !screen? ( app-misc/tmux )"
+
+src_prepare() {
+ default
+
+ python_fix_shebang .
+
+ # Set default system backend to screen
+ if use screen ; then
+ sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+ fi
+}
+
+src_install() {
+ default
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+
+ docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/byobu/metadata.xml b/app-misc/byobu/metadata.xml
new file mode 100644
index 000000000000..0d5f7a14d142
--- /dev/null
+++ b/app-misc/byobu/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription>
+Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
+It was originally designed to provide elegant enhancements to the otherwise
+functional, plain, practical GNU Screen, for the Ubuntu server distribution.
+Byobu now includes an enhanced profiles, convenient keybindings, configuration
+utilities, and toggle-able system status notifications for both the GNU Screen
+window manager and the more modern Tmux terminal multiplexer, and works on most
+Linux, BSD, and Mac distributions.
+</longdescription>
+ <use>
+ <flag name="screen">Use <pkg>app-misc/screen</pkg> as the default backend</flag>
+ </use>
+ <upstream>
+ <remote-id type="launchpad">byobu</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/c_rehash-1.0.2g_p8 b/app-misc/c_rehash-1.0.2g_p8
deleted file mode 100644
index 8c61604253a4..000000000000
--- a/app-misc/c_rehash-1.0.2g_p8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=c_rehash script written in POSIX shell for OpenSSL
-EAPI=5
-HOMEPAGE=https://www.openssl.org/ https://github.com/pld-linux/openssl/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )
-SLOT=0
-SRC_URI=https://github.com/pld-linux/openssl/archive/auto/th/openssl-1.0.2g-8.tar.gz
-_md5_=ca1fcdd121759c81519d21c27987b910
diff --git a/app-misc/c_rehash-1.7-r1 b/app-misc/c_rehash-1.7-r1
deleted file mode 100644
index 715ca6433da3..000000000000
--- a/app-misc/c_rehash-1.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!<dev-libs/openssl-1.0.2d-r1:0
-DESCRIPTION=c_rehash script from OpenSSL
-EAPI=5
-HOMEPAGE=https://www.openssl.org/ https://github.com/pld-linux/openssl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-RDEPEND=!<dev-libs/openssl-1.0.2d-r1:0
-SLOT=0
-SRC_URI=https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_md5_=39812cf31e339aab5c9baa41b6eec2f0
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
new file mode 100644
index 000000000000..5dc7818446ea
--- /dev/null
+++ b/app-misc/c_rehash/Manifest
@@ -0,0 +1,5 @@
+DIST openssl-1.0.2g-8.tar.gz 21497 BLAKE2B 77f0361d338b203dde230817b5ae405ef929c6f8b92192884b1549e152c72aaab2bc280e3a8da427cd478c432acba587bf652d1bf6abfccab51df5a445fc399b SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb
+DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
+EBUILD c_rehash-1.0.2g_p8.ebuild 1025 BLAKE2B 29c3c7c33d8b09fdf79a76b35407ce312d0ac687c5e1d68e6cd318c4a8ab658ca0a6b1a8ca9126e00c58c79f0094d1a62ef0b0100793739ba57843e0fa45c041 SHA512 30345ccdc557112cf9d8cbf00992b03acc77efd20617c8a57b4207e570294ae2e3de4da6e212b0a03a313dfde377ce20a8dc56db10591c8cd2b1075b0a02f270
+EBUILD c_rehash-1.7-r1.ebuild 1028 BLAKE2B 62a51670325b44cab5bcdadfab89322f34f9014983eb94fb7e7cb4992a167bcb204b1d77c5ad64e2eb5bb64c64ea1218e322e1661c40f86f9719dff6248aaeae SHA512 bc6500a576495bbecb42f49292dff490d33758e27e256392540e23db8e011f6b6e82efaa28b87d832dc0cc47caacf969dd4676247759fc32b03c53243c33ecb8
+MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
new file mode 100644
index 000000000000..b6f24de2b58c
--- /dev/null
+++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P="openssl-${PV/_p/-}"
+
+DESCRIPTION="c_rehash script written in POSIX shell for OpenSSL"
+HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/"
+SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="libressl"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:0 )
+"
+
+S="${WORKDIR}/openssl-auto-th-${MY_P}"
+
+src_prepare() {
+ SSL_CNF_DIR="/etc/ssl"
+ sed -i \
+ -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+ -e '1iOPENSSL=openssl' \
+ openssl-c_rehash.sh || die #416717
+}
+
+src_install() {
+ newbin openssl-c_rehash.sh c_rehash
+}
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
new file mode 100644
index 000000000000..3be13f49a13f
--- /dev/null
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="c_rehash script from OpenSSL"
+HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/"
+SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=${PV} -> openssl-c_rehash.sh.${PV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_prepare() {
+ SSL_CNF_DIR="/etc/ssl"
+ sed \
+ -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+ -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
+ "${DISTDIR}"/openssl-c_rehash.sh.${PV} \
+ > "${WORKDIR}"/c_rehash || die #416717
+}
+
+src_install() {
+ dobin "${WORKDIR}"/c_rehash
+}
diff --git a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml
new file mode 100644
index 000000000000..c481526f1340
--- /dev/null
+++ b/app-misc/c_rehash/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">pld-linux/openssl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ca-certificates-20170717.3.36.1 b/app-misc/ca-certificates-20170717.3.36.1
deleted file mode 100644
index e14ec9bd8069..000000000000
--- a/app-misc/ca-certificates-20170717.3.36.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 )
-DESCRIPTION=Common CA Certificates PEM files
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/ca-certificates
-IUSE=insecure_certs cacert
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MPL-1.1
-RDEPEND=app-misc/c_rehash sys-apps/debianutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20170717.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_36_1_RTM/src/nss-3.36.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ddeeef00d2cdeaabac10db6b5fb29294
diff --git a/app-misc/ca-certificates-20180409.3.36.1-r1 b/app-misc/ca-certificates-20180409.3.36.1-r1
deleted file mode 100644
index b1a45db94272..000000000000
--- a/app-misc/ca-certificates-20180409.3.36.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 )
-DESCRIPTION=Common CA Certificates PEM files
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/ca-certificates
-IUSE=cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MPL-1.1
-RDEPEND=app-misc/c_rehash sys-apps/debianutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20180409.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_36_1_RTM/src/nss-3.36.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d2d497fe87fcbb5269ff736d8595bb12
diff --git a/app-misc/ca-certificates-20180409.3.37 b/app-misc/ca-certificates-20180409.3.37
deleted file mode 100644
index fdfd6ece5637..000000000000
--- a/app-misc/ca-certificates-20180409.3.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 )
-DESCRIPTION=Common CA Certificates PEM files
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/ca-certificates
-IUSE=cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MPL-1.1
-RDEPEND=app-misc/c_rehash sys-apps/debianutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20180409.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_RTM/src/nss-3.37.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d2d497fe87fcbb5269ff736d8595bb12
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
new file mode 100644
index 000000000000..85665467e7f9
--- /dev/null
+++ b/app-misc/ca-certificates/Manifest
@@ -0,0 +1,10 @@
+AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
+DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
+DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
+DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
+DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
+DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
+EBUILD ca-certificates-20170717.3.36.1.ebuild 6253 BLAKE2B 6bfae7c926cac36f7bb5358dd1113a6f8bb30bf0c12518ddbe9e0bd771dbf119bbb9e9592c026fde71910552cfd7864dc04b7e9e1686a316019d1bc7de1509b7 SHA512 d233304edde3acf2f0c9732debaa00641d1caa678e91c6fbd7b8ab40d9792fb8acba2468f54dcb34c9e5431aad969b57ce47afbe46bda1a7d5fa62041bfa8bf2
+EBUILD ca-certificates-20180409.3.36.1-r1.ebuild 5740 BLAKE2B c621da402c252de355a9b4bc3b9be63458444a490013e404fd9488a0ed653ee141311b28bacd8f0d0a791e9b985620adc6e50d824ba2d01f3156af42c6534496 SHA512 e16491771037d7c3e47be526a97f1ed10a13dd14992336258ea7b5ff8885f50efbb8ba9a2bfa799c4157e123e93a858090dbc3e1f736852337d8df12bac6df9b
+EBUILD ca-certificates-20180409.3.37.ebuild 5740 BLAKE2B c621da402c252de355a9b4bc3b9be63458444a490013e404fd9488a0ed653ee141311b28bacd8f0d0a791e9b985620adc6e50d824ba2d01f3156af42c6534496 SHA512 e16491771037d7c3e47be526a97f1ed10a13dd14992336258ea7b5ff8885f50efbb8ba9a2bfa799c4157e123e93a858090dbc3e1f736852337d8df12bac6df9b
+MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
new file mode 100644
index 000000000000..a3ffec2423cc
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result. The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+# Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+ # Compile from source ourselves.
+ PRECOMPILED=false
+ inherit versionator
+
+ DEB_VER=$(get_version_component_range 1)
+ NSS_VER=$(get_version_component_range 2-)
+ RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+ # Debian precompiled version.
+ PRECOMPILED=true
+ inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+ https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+ cacert? (
+ https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+ )"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="insecure_certs"
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+ DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+ app-misc/c_rehash
+ sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+ DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+ # For the conversion to having it in CONFIG_PROTECT_MASK,
+ # we need to tell users about it once manually first.
+ [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+ || ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+ ${PRECOMPILED} || default
+
+ # Do all the work in the image subdir to avoid conflicting with source
+ # dirs in $WORKDIR. Need to perform everything in the offset #381937
+ mkdir -p "image/${EPREFIX}"
+ cd "image/${EPREFIX}" || die
+
+ ${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+ cd "image/${EPREFIX}" || die
+ if ! ${PRECOMPILED} ; then
+ mkdir -p usr/sbin
+ cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+ if use cacert ; then
+ pushd "${S}"/nss-${NSS_VER} >/dev/null
+ epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
+ popd >/dev/null
+ fi
+ fi
+
+ default
+ eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+ local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+ sed -i \
+ -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+ -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+ usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+ cd "image/${EPREFIX}" || die
+ if ! ${PRECOMPILED} ; then
+ python_setup
+ local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
+ # Grab the database from the nss sources.
+ cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+ emake -C "${d}"
+
+ # Now move the files to the same places that the precompiled would.
+ mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
+ if use cacert ; then
+ mkdir -p "${c}"/cacert.org
+ mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
+ fi
+ mv "${d}"/*.crt "${c}"/mozilla/ || die
+ else
+ mv usr/share/doc/{ca-certificates,${PF}} || die
+ fi
+
+ if ! use insecure_certs ; then
+ elog "To prevent applications relying on system's trusted root certificate store"
+ elog "from using CAs where at least one major browser vendor Gentoo is following"
+ elog "has decided to apply trust level restrictions, the following"
+ elog "certificate(s) were removed:"
+ # Remove untrusted certs from StartCom and WoSign (bug #598072)
+ elog "$(find "${c}" -type f \( \
+ -iname '*startcom*' \
+ -o -iname '*wosign*' \
+ \) -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)"
+ fi
+
+ (
+ echo "# Automatically generated by ${CATEGORY}/${PF}"
+ echo "# $(date -u)"
+ echo "# Do not edit."
+ cd "${c}"
+ find * -name '*.crt' | LC_ALL=C sort
+ ) > etc/ca-certificates.conf
+
+ sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+ cp -pPR image/* "${D}"/ || die
+ if ! ${PRECOMPILED} ; then
+ cd ca-certificates
+ doman sbin/*.8
+ dodoc debian/README.* examples/ca-certificates-local/README
+ fi
+
+ echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+ doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+ if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
+ # if the user has local certs, we need to rebuild again
+ # to include their stuff in the db.
+ # However it's too overzealous when the user has custom certs in place.
+ # --fresh is to clean up dangling symlinks
+ "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+ fi
+
+ if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
+ ewarn "Removing the following broken symlinks:"
+ ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+ fi
+}
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild
new file mode 100644
index 000000000000..8d5bc12f58ed
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result. The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+# Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+ # Compile from source ourselves.
+ PRECOMPILED=false
+ inherit versionator
+
+ DEB_VER=$(get_version_component_range 1)
+ NSS_VER=$(get_version_component_range 2-)
+ RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+ # Debian precompiled version.
+ PRECOMPILED=true
+ inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+ https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+ cacert? (
+ https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+ )"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+ DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+ app-misc/c_rehash
+ sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+ DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+ # For the conversion to having it in CONFIG_PROTECT_MASK,
+ # we need to tell users about it once manually first.
+ [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+ || ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+ ${PRECOMPILED} || default
+
+ # Do all the work in the image subdir to avoid conflicting with source
+ # dirs in $WORKDIR. Need to perform everything in the offset #381937
+ mkdir -p "image/${EPREFIX}"
+ cd "image/${EPREFIX}" || die
+
+ ${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+ cd "image/${EPREFIX}" || die
+ if ! ${PRECOMPILED} ; then
+ mkdir -p usr/sbin
+ cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+ if use cacert ; then
+ pushd "${S}"/nss-${NSS_VER} >/dev/null
+ eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+ popd >/dev/null
+ fi
+ fi
+
+ default
+ eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+ local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+ sed -i \
+ -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+ -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+ -e 's/openssl rehash/c_rehash/' \
+ usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+ cd "image/${EPREFIX}" || die
+ if ! ${PRECOMPILED} ; then
+ python_setup
+ local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
+ # Grab the database from the nss sources.
+ cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+ emake -C "${d}"
+
+ # Now move the files to the same places that the precompiled would.
+ mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
+ if use cacert ; then
+ mkdir -p "${c}"/cacert.org
+ mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
+ fi
+ mv "${d}"/*.crt "${c}"/mozilla/ || die
+ else
+ mv usr/share/doc/{ca-certificates,${PF}} || die
+ fi
+
+ (
+ echo "# Automatically generated by ${CATEGORY}/${PF}"
+ echo "# $(date -u)"
+ echo "# Do not edit."
+ cd "${c}"
+ find * -name '*.crt' | LC_ALL=C sort
+ ) > etc/ca-certificates.conf
+
+ sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+ cp -pPR image/* "${D}"/ || die
+ if ! ${PRECOMPILED} ; then
+ cd ca-certificates
+ doman sbin/*.8
+ dodoc debian/README.* examples/ca-certificates-local/README
+ fi
+
+ echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+ doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+ if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
+ # if the user has local certs, we need to rebuild again
+ # to include their stuff in the db.
+ # However it's too overzealous when the user has custom certs in place.
+ # --fresh is to clean up dangling symlinks
+ "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+ fi
+
+ if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
+ ewarn "Removing the following broken symlinks:"
+ ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+ fi
+}
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
new file mode 100644
index 000000000000..8d5bc12f58ed
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result. The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+# Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+ # Compile from source ourselves.
+ PRECOMPILED=false
+ inherit versionator
+
+ DEB_VER=$(get_version_component_range 1)
+ NSS_VER=$(get_version_component_range 2-)
+ RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+ # Debian precompiled version.
+ PRECOMPILED=true
+ inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+ https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+ cacert? (
+ https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+ )"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+ DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+ app-misc/c_rehash
+ sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+ DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+ # For the conversion to having it in CONFIG_PROTECT_MASK,
+ # we need to tell users about it once manually first.
+ [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+ || ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+ ${PRECOMPILED} || default
+
+ # Do all the work in the image subdir to avoid conflicting with source
+ # dirs in $WORKDIR. Need to perform everything in the offset #381937
+ mkdir -p "image/${EPREFIX}"
+ cd "image/${EPREFIX}" || die
+
+ ${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+ cd "image/${EPREFIX}" || die
+ if ! ${PRECOMPILED} ; then
+ mkdir -p usr/sbin
+ cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+ if use cacert ; then
+ pushd "${S}"/nss-${NSS_VER} >/dev/null
+ eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+ popd >/dev/null
+ fi
+ fi
+
+ default
+ eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+ local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+ sed -i \
+ -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+ -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+ -e 's/openssl rehash/c_rehash/' \
+ usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+ cd "image/${EPREFIX}" || die
+ if ! ${PRECOMPILED} ; then
+ python_setup
+ local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
+ # Grab the database from the nss sources.
+ cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+ emake -C "${d}"
+
+ # Now move the files to the same places that the precompiled would.
+ mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
+ if use cacert ; then
+ mkdir -p "${c}"/cacert.org
+ mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
+ fi
+ mv "${d}"/*.crt "${c}"/mozilla/ || die
+ else
+ mv usr/share/doc/{ca-certificates,${PF}} || die
+ fi
+
+ (
+ echo "# Automatically generated by ${CATEGORY}/${PF}"
+ echo "# $(date -u)"
+ echo "# Do not edit."
+ cd "${c}"
+ find * -name '*.crt' | LC_ALL=C sort
+ ) > etc/ca-certificates.conf
+
+ sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+ cp -pPR image/* "${D}"/ || die
+ if ! ${PRECOMPILED} ; then
+ cd ca-certificates
+ doman sbin/*.8
+ dodoc debian/README.* examples/ca-certificates-local/README
+ fi
+
+ echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+ doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+ if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
+ # if the user has local certs, we need to rebuild again
+ # to include their stuff in the db.
+ # However it's too overzealous when the user has custom certs in place.
+ # --fresh is to clean up dangling symlinks
+ "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+ fi
+
+ if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
+ ewarn "Removing the following broken symlinks:"
+ ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+ fi
+}
diff --git a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch
new file mode 100644
index 000000000000..6e41ac39e874
--- /dev/null
+++ b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch
@@ -0,0 +1,49 @@
+add a --root option so we can generate with DESTDIR installs
+
+--- a/image/usr/sbin/update-ca-certificates
++++ b/image/usr/sbin/update-ca-certificates
+@@ -30,6 +30,8 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates
+ CERTBUNDLE=ca-certificates.crt
+ ETCCERTSDIR=/etc/ssl/certs
+ HOOKSDIR=/etc/ca-certificates/update.d
++ROOT=""
++RELPATH=""
+
+ while [ $# -gt 0 ];
+ do
+@@ -59,13 +61,25 @@ do
+ --hooksdir)
+ shift
+ HOOKSDIR="$1";;
++ --root|-r)
++ shift
++ # Needed as c_rehash wants to read the files directly.
++ # This gets us from $CERTSCONF to $CERTSDIR.
++ RELPATH="../../.."
++ ROOT=$(readlink -f "$1");;
+ --help|-h|*)
+- echo "$0: [--verbose] [--fresh]"
++ echo "$0: [--verbose] [--fresh] [--root <dir>]"
+ exit;;
+ esac
+ shift
+ done
+
++CERTSCONF="$ROOT$CERTSCONF"
++CERTSDIR="$ROOT$CERTSDIR"
++LOCALCERTSDIR="$ROOT$LOCALCERTSDIR"
++ETCCERTSDIR="$ROOT$ETCCERTSDIR"
++HOOKSDIR="$ROOT$HOOKSDIR"
++
+ if [ ! -s "$CERTSCONF" ]
+ then
+ fresh=1
+@@ -94,7 +107,7 @@ add() {
+ -e 's/,/_/g').pem"
+ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
+ then
+- ln -sf "$CERT" "$PEM"
++ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM"
+ echo "+$PEM" >> "$ADDED"
+ fi
+ # Add trailing newline to certificate, if it is missing (#635570)
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
new file mode 100644
index 000000000000..3aa7f10648b3
--- /dev/null
+++ b/app-misc/ca-certificates/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <use>
+ <flag name="cacert">
+ Include root certificates from CAcert (http://www.cacert.org/) and Software
+ in the Public Interest (http://www.spi-inc.org/)
+ </flag>
+ <flag name="insecure_certs">
+ Install certificates which are known to be untrustworthy.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/cadubi-1.3 b/app-misc/cadubi-1.3
deleted file mode 100644
index 63ccb6e3b30c..000000000000
--- a/app-misc/cadubi-1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=dev-perl/TermReadKey-2.21
-DESCRIPTION=An application that allows you to draw ASCII-Art images
-EAPI=6
-HOMEPAGE=http://langworth.com/CadubiProject
-KEYWORDS=~amd64 ppc ppc64 x86
-LICENSE=Artistic
-SLOT=0
-SRC_URI=http://langworth.com/downloads/cadubi-1.3.tar.gz
-_md5_=c116b211ef577c6ed28bdcedb8c9bb39
diff --git a/app-misc/cadubi/Manifest b/app-misc/cadubi/Manifest
new file mode 100644
index 000000000000..f40ea4ad62a4
--- /dev/null
+++ b/app-misc/cadubi/Manifest
@@ -0,0 +1,4 @@
+AUX cadubi-1.3-helpfile.patch 351 BLAKE2B 1dae10ad3b58bfc21b0c1ffcccbaec6c41de3433fad5657ed02273fb0f91e3e0ad3c15292c8bc5cca5850cbd0ad41d3fed8705f50f22431908565f5f66e27da6 SHA512 36c2af2d77a58d5091b7171495a8d788e219e65a664fe0bfd55800a2aacaac04db5e2d249c6bc8737336c43e2852687f7fee7da4510597d64b40abe4843cdac3
+DIST cadubi-1.3.tar.gz 12559 BLAKE2B d1a32d602c00d76717e8e6cdf8d376dca12f9f55f9375bb0b8ea781cf923cfb90789cc011a3ab33960339ced3c05c668f6c6ec6e5b33ca89f7eda27c47789639 SHA512 e3b5190850bd4d579934bd5825db2b8bde5a46158862ec66b8604999344138477c0fb3fad34dc186ed9dd67dfbdcacf12763f76adbdfbd0cc4dbf6b51ad53bc7
+EBUILD cadubi-1.3.ebuild 574 BLAKE2B 690a332da44371b7fab741801b9cc0465962db1d5a6b2e51e53688a06f3a3c4ebfd70a4282921aa174839de0de3c05cbc81864b91d6f59fbd6d82dbb3a4342ba SHA512 804928407e3d0e042b1b1395720f373992a21c2037066771d1480b3cc3079c38e22ecad4101b55124f2c2a277e16e9f24bf741bb0df32f146d509b78bb303be0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cadubi/cadubi-1.3.ebuild b/app-misc/cadubi/cadubi-1.3.ebuild
new file mode 100644
index 000000000000..9e51a1ee8b47
--- /dev/null
+++ b/app-misc/cadubi/cadubi-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An application that allows you to draw ASCII-Art images"
+HOMEPAGE="http://langworth.com/CadubiProject"
+SRC_URI="http://langworth.com/downloads/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+ >=dev-perl/TermReadKey-2.21"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-helpfile.patch
+}
+
+src_install() {
+ dobin cadubi
+ insinto /usr/$(get_libdir)/${PN}
+ doins help.txt
+ dodoc README
+}
diff --git a/app-misc/cadubi/files/cadubi-1.3-helpfile.patch b/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
new file mode 100644
index 000000000000..fd54d5c8bfb1
--- /dev/null
+++ b/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
@@ -0,0 +1,11 @@
+--- a/cadubi.orig 2004-03-29 22:36:24.280138064 +0200
++++ b/cadubi 2004-03-29 22:39:34.473224320 +0200
+@@ -18,7 +18,7 @@
+ # (sorry guys, i wrote this years before i had the remotest clue as to
+ # what the hell i was doing)
+ use FindBin qw($Bin);
+-$HELPFILE = "$Bin/help.txt";
++$HELPFILE = "$Bin/../lib/cadubi/help.txt";
+
+ # other stuff
+ $DEBUG = 0;
diff --git a/app-misc/cadubi/metadata.xml b/app-misc/cadubi/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/cadubi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/calendar-0.9.1-r1 b/app-misc/calendar-0.9.1-r1
deleted file mode 100644
index 0a89a320cfd2..000000000000
--- a/app-misc/calendar-0.9.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
-EAPI=6
-HOMEPAGE=http://bsdcalendar.sourceforge.net/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d2c1cda523d32cb50da20864467099a8
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
new file mode 100644
index 000000000000..14737610d0bc
--- /dev/null
+++ b/app-misc/calendar/Manifest
@@ -0,0 +1,3 @@
+DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
+EBUILD calendar-0.9.1-r1.ebuild 629 BLAKE2B a357c49d2db7065e887c29b898696bc097a26b77b775dbd8a56112a871d3ca1573009d3ad1ecbce3b954c99bc3d538e120ed2b6f47aadf5504dbbd51449ceffb SHA512 be43b9744c0936fc7498e6d9cda7b378dc665d6784720ef2dea424d360376b9df2f1abd1e5f4e0e1ee148257cf0bfd70bab7c09e317f95409a131b463b08e229
+MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..e4eb46e51434
--- /dev/null
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standard unix calendar program for Linux, ported from OpenBSD"
+HOMEPAGE="http://bsdcalendar.sourceforge.net/"
+SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+
+DOCS=( README )
+
+src_compile() {
+ tc-export CC
+ emake
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+
+ insinto "/usr/share"
+ doins -r "${PN}s"
+
+ mv "${D}/usr/share/${PN}s" "${D}/usr/share/${PN}" || die
+
+ einstalldocs
+}
diff --git a/app-misc/calendar/metadata.xml b/app-misc/calendar/metadata.xml
new file mode 100644
index 000000000000..11d4b7f60eb2
--- /dev/null
+++ b/app-misc/calendar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">bsdcalendar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/carbon-c-relay-3.1-r1 b/app-misc/carbon-c-relay-3.1-r1
deleted file mode 100644
index 178911f0e204..000000000000
--- a/app-misc/carbon-c-relay-3.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install preinst
-DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
-EAPI=6
-HOMEPAGE=https://github.com/grobian/carbon-c-relay
-KEYWORDS=~amd64 ~arm ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.1/carbon-c-relay-3.1.tar.gz
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=ae5aea70ef79558f43f5520cf96f819d
diff --git a/app-misc/carbon-c-relay-3.2 b/app-misc/carbon-c-relay-3.2
deleted file mode 100644
index c00512ab56c0..000000000000
--- a/app-misc/carbon-c-relay-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DEPEND=lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0 ) zlib? ( app-arch/gzip )
-DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
-EAPI=6
-HOMEPAGE=https://github.com/grobian/carbon-c-relay
-IUSE=lz4 ssl zlib
-KEYWORDS=~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0 ) zlib? ( app-arch/gzip )
-SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.2/carbon-c-relay-3.2.tar.gz
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=c28260e9f07619f4f696c2390bafdd30
diff --git a/app-misc/carbon-c-relay-3.3 b/app-misc/carbon-c-relay-3.3
deleted file mode 100644
index 264a138430f8..000000000000
--- a/app-misc/carbon-c-relay-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DEPEND=lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0 ) zlib? ( app-arch/gzip ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
-DESCRIPTION=Enhanced C version of Carbon relay, aggregator and rewriter
-EAPI=6
-HOMEPAGE=https://github.com/grobian/carbon-c-relay
-IUSE=lz4 ssl zlib pcre pcre2 +oniguruma
-KEYWORDS=~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0 ) zlib? ( app-arch/gzip ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )
-REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
-SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.3/carbon-c-relay-3.3.tar.gz
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=d0d44878dd4250c7046d69b852545755
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
new file mode 100644
index 000000000000..552c754474c0
--- /dev/null
+++ b/app-misc/carbon-c-relay/Manifest
@@ -0,0 +1,11 @@
+AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e56040027b5bdbdb2ab22b010fb78acc69a1532738d6e76d453eaefcef0e47d3a5cc6f123167ee6687ce8bc8dc923 SHA512 39c4838e39c494ac70573f1d7202d7bf359a01903877eabac60f5576c288372897c72393322a3d991ae6bfc75f8275c178ead912321836f570b6535b9c53fa8e
+AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
+AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
+AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
+DIST carbon-c-relay-3.1.tar.gz 271011 BLAKE2B 62d97ba268f121db466a761001f0c5f49e2571edc26c90ee4f40d311cc3f9abb55178ea375c6663407d5fce78c5162a8460a260c9baa7faed3908fc2e4bb9870 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e
+DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4
+DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879
+EBUILD carbon-c-relay-3.1-r1.ebuild 765 BLAKE2B 6596ee93330fbe973d42479a8d8b1b1174464a5ffdc513cfb6235ed069873e59177fa1d9be862a579c2ed4c482b2a8df5b8cb3f9b8dc075ce4615133dbc5a381 SHA512 ab94696270aa31b1c4b48320aa211a4488f613a28497c6d08c502a9e14e642ea89d08233f6f128b7ddb5ef31e361bbe7053e91118d1fdbd4b40a9d1e12ce59fa
+EBUILD carbon-c-relay-3.2.ebuild 941 BLAKE2B 08b97db03e44cc14b3b1d3d8f8a5acfb9c23d7dead00c2e1c3088b524e5f19865e8599e915d1b84c7ed7414c66cc1c75dba20ba467b8b4d8b34aa69f942f7e22 SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85
+EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
+MISC metadata.xml 578 BLAKE2B 6b8f16ecb046eecf1315d39e62dacf5c79896b80375eed7696acf791b3e3324e008f122e8deec4098d2298200a655e497fdac1d059aac3d6b7d8df980b8a29cc SHA512 78615eb4a4d5812d45ede2a138ab70ad2c6152ef5e4f7873cb4e95f29ad643f9a9a7e8db5b52f61a7f464e2c875591bfe359970ed6dde1c7188c59c6ba87d211
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
new file mode 100644
index 000000000000..b8caef32bf9c
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+ enewgroup carbon
+ enewuser carbon -1 -1 -1 carbon
+}
+
+src_install() {
+ default
+ # rename too generic name
+ mv "${ED}"/usr/bin/{relay,${PN}} || die
+ dodoc ChangeLog.md
+
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild
new file mode 100644
index 000000000000..b90690b8cff7
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 ssl zlib"
+
+RDEPEND="lz4? ( app-arch/lz4 )
+ ssl? ( dev-libs/openssl:0 )
+ zlib? ( app-arch/gzip )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+ enewgroup carbon
+ enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+ econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip)
+}
+
+src_install() {
+ default
+ # rename too generic name
+ mv "${ED}"/usr/bin/{relay,${PN}} || die
+ dodoc ChangeLog.md
+
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild
new file mode 100644
index 000000000000..f5a67797fa22
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 ssl zlib pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+ pcre2? ( !oniguruma )
+ oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+ ssl? ( dev-libs/openssl:0 )
+ zlib? ( app-arch/gzip )
+ !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+ pcre2? ( dev-libs/libpcre2 )
+ oniguruma? ( dev-libs/oniguruma )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+ enewgroup carbon
+ enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+ local pcrecfg
+ if use !pcre2 && use !oniguruma ; then
+ pcrecfg=$(use_with pcre)
+ else
+ pcrecfg="--without-pcre"
+ fi
+
+ econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip) \
+ "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+ default
+ # rename too generic name
+ mv "${ED}"/usr/bin/{relay,${PN}} || die
+ dodoc ChangeLog.md
+
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.confd b/app-misc/carbon-c-relay/files/carbon-c-relay.confd
new file mode 100644
index 000000000000..d2824644d3c0
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.confd
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# routing file to read
+#ROUTES_FILE=/etc/carbon-c-relay.conf
+
+# where to store the PID-file
+#PIDFILE=/run/carbon-c-relay.pid
+
+# user and group to run carbon-c-relay as
+#USER=carbon
+#GROUP=carbon
+
+# any options to use when starting the relay
+#EXTRA_OPTS=
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
new file mode 100644
index 000000000000..5233eec2d2a1
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# routing file to read
+#ROUTES_FILE=/etc/carbon-c-relay.conf
+
+# where to store the logfile
+#LOGFILE=/var/log/carbon-c-relay.log
+
+# user and group to run carbon-c-relay as
+#USER=carbon
+#GROUP=carbon
+
+# any options to use when starting the relay
+#EXTRA_OPTS=
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd b/app-misc/carbon-c-relay/files/carbon-c-relay.initd
new file mode 100644
index 000000000000..8d39afe05d49
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="Lightweight graphite metrics router and aggregator."
+description_configtest="Run carbon-c-relay's internal config check."
+description_reload="Reload the carbon-c-relay configuration without losing connections."
+
+routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
+
+command="/usr/bin/carbon-c-relay"
+command_args="-f ${routes_config} ${EXTRA_OPTS}"
+pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+ touch /var/log/${SVCNAME}.log
+ chown ${user}:${group} /var/log/${SVCNAME}.log
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ rm -f ${pidfile}
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --background --make-pidfile --pidfile ${pidfile} \
+ --stdout /var/log/${SVCNAME}.log \
+ --stderr /var/log/${SVCNAME}.log \
+ --user ${user} --group ${group} \
+ --exec ${command} -- ${command_args}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec ${command} --pidfile ${pidfile}
+ eend $?
+}
+
+reload() {
+ configtest || return 1
+ ebegin "Refreshing ${SVCNAME}'s configuration"
+ kill -HUP $(< ${pidfile}) &>/dev/null
+ eend $? "Failed to reload ${SVCNAME}"
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME}'s configuration"
+ ${command} -f "${routes_config}" -t < /dev/null > /dev/null
+ eend $? "failed, please correct errors above"
+}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
new file mode 100644
index 000000000000..1e2734941cc1
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="Lightweight graphite metrics router and aggregator."
+description_configtest="Run carbon-c-relay's internal config check."
+description_reload="Reload the carbon-c-relay configuration without losing connections."
+
+routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
+
+command="/usr/bin/carbon-c-relay"
+command_args="-f ${routes_config} ${EXTRA_OPTS}"
+pidfile="/run/carbon-c-relay/${SVCNAME}.pid"
+logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+ touch "${logfile}"
+ mkdir -p "${pidfile%/*}"
+ chown ${user}:${group} "${logfile}" "${pidfile%/*}"
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ rm -f "${pidfile}"
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --pidfile "${pidfile}" \
+ --user ${user} --group ${group} \
+ --exec ${command} -- -D -P "${pidfile}" -l "${logfile}" \
+ ${command_args}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ # migration path
+ local pfile=${pidfile}
+ [[ -e /run/carbon-c-relay.pid ]] && pfile="/run/carbon-c-relay.pid"
+ start-stop-daemon --stop --exec ${command} --pidfile "${pfile}"
+ eend $?
+}
+
+reload() {
+ configtest || return 1
+ ebegin "Refreshing ${SVCNAME}'s configuration"
+ kill -HUP $(< "${pidfile}") &>/dev/null
+ eend $? "Failed to reload ${SVCNAME}"
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME}'s configuration"
+ ${command} -f "${routes_config}" -t < /dev/null > /dev/null
+ eend $? "failed, please correct errors above"
+}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
new file mode 100644
index 000000000000..c023cb5be2a9
--- /dev/null
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grobian@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="lz4">add support for LZ4 compressed transport</flag>
+ <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
+ <flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">grobian/carbon-c-relay</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/cbrpager-0.9.22 b/app-misc/cbrpager-0.9.22
deleted file mode 100644
index 4b09a3e179ac..000000000000
--- a/app-misc/cbrpager-0.9.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=|| ( app-arch/unrar app-arch/rar ) >=gnome-base/libgnomeui-2 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=a simple comic book pager
-EAPI=6
-HOMEPAGE=http://cbrpager.sourceforge.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( app-arch/unrar app-arch/rar ) >=gnome-base/libgnomeui-2
-SLOT=0
-SRC_URI=mirror://sourceforge/cbrpager/cbrpager-0.9.22.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=eb920a40860e50fa8bca654f2873138d
diff --git a/app-misc/cbrpager/Manifest b/app-misc/cbrpager/Manifest
new file mode 100644
index 000000000000..eda972769123
--- /dev/null
+++ b/app-misc/cbrpager/Manifest
@@ -0,0 +1,3 @@
+DIST cbrpager-0.9.22.tar.gz 146216 BLAKE2B 3396328ea7e017e0cf13722cc8545ce75ccf2cbc0446d1fcebefa02527dc32e3403ed29e456507495ebc3bcd94ce6a42b9b9f574b581952d94bee1efbc2a1ef9 SHA512 dc4bcf14528e6708a3ff0fc3b7e3163dfb9d6063f1cf40545b4f804915afedd9db4cd461834de7ee92fcd4b2f302b7f2ed0d9ae022e220dd8e6c95ccabea34d5
+EBUILD cbrpager-0.9.22.ebuild 580 BLAKE2B 61f96297dd8ff69b70398e19bf3821ead3b66769a68690bea7cf7ba1fb738b926e604f0e6de9acb0fbee10d83179af1cff7adb93031c6874fdf21e634252b045 SHA512 3c62931298b02360c2fc69d0603c45ad27acb99a82ad48b20d523ad895e4ce2d4a71e88c45abd42a7b5b8c6f88dcf8e4a2673314e7f4bf21db934a84a0baa519
+MISC metadata.xml 321 BLAKE2B d02f200968d8ae7336e01364267000063fdbf1865e5e2a0130f396bae5f7c5be91a84acbe5e3b307c87b77d98229e16c42aa2a70c7356f5ca12bb8c4b7cba836 SHA512 78b81a6c1d3bc153ce6b9e5f3a7169daf841de3705a956721cba492f952f0baa2e5db340d87f0ea18e9d2f2a2a5fcccaac2ff72f095ccc90b48bf3a23857d5e4
diff --git a/app-misc/cbrpager/cbrpager-0.9.22.ebuild b/app-misc/cbrpager/cbrpager-0.9.22.ebuild
new file mode 100644
index 000000000000..71d60c799200
--- /dev/null
+++ b/app-misc/cbrpager/cbrpager-0.9.22.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop
+
+DESCRIPTION="a simple comic book pager"
+HOMEPAGE="http://cbrpager.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="|| ( app-arch/unrar app-arch/rar )
+ >=gnome-base/libgnomeui-2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_install() {
+ default
+ dodoc CONTRIBUTORS
+
+ make_desktop_entry ${PN} "CBR Pager" ${PN} "Graphics;Viewer;Amusement;GTK"
+}
diff --git a/app-misc/cbrpager/metadata.xml b/app-misc/cbrpager/metadata.xml
new file mode 100644
index 000000000000..bcf8ff6b0728
--- /dev/null
+++ b/app-misc/cbrpager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">cbrpager</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/cbview-0.06-r1 b/app-misc/cbview-0.06-r1
deleted file mode 100644
index 600249522c9e..000000000000
--- a/app-misc/cbview-0.06-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-perl/Gtk2 dev-perl/String-ShellQuote app-arch/unrar app-arch/unzip
-DESCRIPTION=viewer/converter for CBR/CBZ comic book archives
-EAPI=6
-HOMEPAGE=https://web.archive.org/web/20061108214126/http://elvine.org:80/code/cbview/
-KEYWORDS=~x86 ~ppc ~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://elvine.org/code/cbview/cbview-0.06.tar.gz
-_md5_=1e2808ccd8974476d7f444785c74920a
diff --git a/app-misc/cbview/Manifest b/app-misc/cbview/Manifest
new file mode 100644
index 000000000000..62614505ac7c
--- /dev/null
+++ b/app-misc/cbview/Manifest
@@ -0,0 +1,3 @@
+DIST cbview-0.06.tar.gz 16351 BLAKE2B 5e343eb00250d470b7e64d717b06ea1d048aace755ada2348c656443759a12c6912b7f766f066d0b2c2e7b6926ccb46472051f636646dddc288f64b66e752684 SHA512 4a680243a8c31fafad8826d1ead6d21fcce3642beef9ed82b19a7a75d78e7af32cd8d7800de15bd2b9a59241f81a295b7da8f7a80fa482b41fb589a274bfea06
+EBUILD cbview-0.06-r1.ebuild 540 BLAKE2B 1c9d7c3f3a918b5743961a31afa0f3236c2a88e507141d04b93b5683d215e10b62f9dd1da8a640c5608dbbee25e84da11596aea70db9a5b6aeaf68c08dc3ce57 SHA512 0fea9e78cb782cceaa4b3bddd7fa699b09f254613ae73fb0904ada2011041aed03313fbe36e04a911845eaf06c286b20777f6ec38984c09f9a6f74fd22029036
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cbview/cbview-0.06-r1.ebuild b/app-misc/cbview/cbview-0.06-r1.ebuild
new file mode 100644
index 000000000000..286374eacc42
--- /dev/null
+++ b/app-misc/cbview/cbview-0.06-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="viewer/converter for CBR/CBZ comic book archives"
+HOMEPAGE="https://web.archive.org/web/20061108214126/http://elvine.org:80/code/cbview/"
+SRC_URI="http://elvine.org/code/cbview/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-perl/Gtk2
+ dev-perl/String-ShellQuote
+ app-arch/unrar
+ app-arch/unzip"
+
+src_install() {
+ dobin cbview
+ dodoc README TODO
+}
diff --git a/app-misc/cbview/metadata.xml b/app-misc/cbview/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/cbview/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/cdargs-1.35-r2 b/app-misc/cdargs-1.35-r2
deleted file mode 100644
index bb0a674e7b1e..000000000000
--- a/app-misc/cdargs-1.35-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=sys-libs/ncurses:0= emacs? ( virtual/emacs ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Bookmarks and browser for the shell builtin cd command
-EAPI=5
-HOMEPAGE=http://www.skamphausen.de/cgi-bin/ska/CDargs
-IUSE=emacs
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://www.skamphausen.de/software/cdargs/cdargs-1.35.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45cfa72a93551b8b0036a4c48b4aa63c
diff --git a/app-misc/cdargs/Manifest b/app-misc/cdargs/Manifest
new file mode 100644
index 000000000000..d4d59806bbf6
--- /dev/null
+++ b/app-misc/cdargs/Manifest
@@ -0,0 +1,6 @@
+AUX 50cdargs-gentoo.el 270 BLAKE2B d39eb5ffd0e910aae99706b6e802621180a090d6ee221b5fad300b37c3a337bfa6f7aa0e0673e6776b8090bad9e8ded919d242e2d47c293dd102a64b01238ba7 SHA512 ee6765ea4222102678d482a3728e2ba3aac0b0709b6148b7d7755421e00125be0b15a41bce2d8fce4340865a10863f519d5c87729aa66ec9216e9618cf059f75
+AUX cdargs-1.35-format_security.patch 4482 BLAKE2B bf7eb8cde3061bee105ca5f16fafa65fa43a0f600f80998e4d0e4244e277f4a0c557fade1a3a384642a75494a5cf1f94d4b678bb2d3322c128cf995eda495213 SHA512 379d220d9d257af5e260a4234653520d08078c2a89d30216f9d6c1b77e6aa18ff82d1c609203ceebd78ba238077acf0eda34d2a1e00fb059db6ba7a9fedfe3ff
+AUX cdargs-1.35-tinfo.patch 624 BLAKE2B 82a3210fbed0fd4f5903ef621a330e8eb01a9169e29cb2c09784c135581c5d08969c26b14e48797a27a3d73390371c8931ca00e1418de8bf01ccf5215435f50f SHA512 3f332d2f76c71affa92ab30b527621dafae09655b71839598784498fb7b07e5967907d6977bb2321ea7043a9c82d6dc2273c3bb5bf0fa7a8d4b11635442640b6
+DIST cdargs-1.35.tar.gz 74103 BLAKE2B 06fa5b4ed7c00dbcceeda28c2b02dd46431748434a692f3690885dc1141764e8aacef2e09cab57cf1baab32cb66c5c39a846a09fd6381723f47cd8dc98c8584f SHA512 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c
+EBUILD cdargs-1.35-r2.ebuild 1519 BLAKE2B 9ed71d63a460f16fbef8b137c695ad6a1e2af472982dc3951d9c842086e43fefc5f65508e1380c2c673aa4cad3e191755310556f817bfd94fd679e7d67c5af83 SHA512 39e329484f66651c34b3f2e45e33c1b657f89d2f150b8ae5136636cc807bea8350571b82bbe45f1853cc1b99b32d4513c46a28cae724f942c5d43929a0b4cc26
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild
new file mode 100644
index 000000000000..28fca19b1a63
--- /dev/null
+++ b/app-misc/cdargs/cdargs-1.35-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Bookmarks and browser for the shell builtin cd command"
+HOMEPAGE="http://www.skamphausen.de/cgi-bin/ska/CDargs"
+SRC_URI="http://www.skamphausen.de/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="emacs"
+
+DEPEND="
+ sys-libs/ncurses:0=
+ emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=(
+ "${FILESDIR}"/${P}-format_security.patch
+ "${FILESDIR}"/${P}-tinfo.patch
+ )
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_compile() {
+ default
+
+ use emacs && elisp-compile contrib/cdargs.el
+}
+
+src_install() {
+ default
+
+ cd "${S}/contrib" || die
+ insinto /usr/share/cdargs
+ doins cdargs-bash.sh cdargs-tcsh.csh
+ if use emacs ; then
+ elisp-install ${PN} cdargs.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+
+ echo
+ elog "Add the following line to your ~/.bashrc to enable cdargs helper"
+ elog "functions/aliases in your environment:"
+ elog "[ -f /usr/share/cdargs/cdargs-bash.sh ] && \\ "
+ elog " source /usr/share/cdargs/cdargs-bash.sh"
+ elog
+ elog "Users of tcshell will find cdargs-tcsh.csh there with a reduced"
+ elog "feature set. See INSTALL file in the documentation directory for"
+ elog "more information."
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-misc/cdargs/files/50cdargs-gentoo.el b/app-misc/cdargs/files/50cdargs-gentoo.el
new file mode 100644
index 000000000000..f9203b308ce0
--- /dev/null
+++ b/app-misc/cdargs/files/50cdargs-gentoo.el
@@ -0,0 +1,8 @@
+
+;;; app-misc/cdargs site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cdargs "cdargs"
+ "Change the current working directory using a bookmarks file." t)
+(defalias 'cv 'cdargs)
+(autoload 'cdargs-edit "cdargs" "Simply open the bookmarks file" t)
diff --git a/app-misc/cdargs/files/cdargs-1.35-format_security.patch b/app-misc/cdargs/files/cdargs-1.35-format_security.patch
new file mode 100644
index 000000000000..978a8e92c088
--- /dev/null
+++ b/app-misc/cdargs/files/cdargs-1.35-format_security.patch
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>cdargs.git - cdargs</title>
+<meta name='generator' content='cgit v0.10.2'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/cdargs.git/atom/cdargs-1.35_format_security.patch?h=master' type='application/atom+xml'/>
+</head>
+<body>
+<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
+<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
+
+<script>
+ var base = 'https://apps.fedoraproject.org/';
+ var tokens = window.location.href.split('/');
+ var repo = null;
+ if (tokens.length > 4 && tokens[4] != '') {
+ repo = tokens[4].split('.')[0];
+ }
+ fedmenu({
+ 'url': base + 'js/data.js',
+ 'mimeType': 'application/javascript',
+ 'position': 'bottom-right',
+ 'package': repo,
+ });
+</script>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='cdargs.git' href='/cgit/cdargs.git/'>cdargs.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='f10'>f10</option>
+<option value='f11'>f11</option>
+<option value='f12'>f12</option>
+<option value='f13'>f13</option>
+<option value='f14'>f14</option>
+<option value='f15'>f15</option>
+<option value='f16'>f16</option>
+<option value='f17'>f17</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='f21'>f21</option>
+<option value='f22'>f22</option>
+<option value='f7'>f7</option>
+<option value='f8'>f8</option>
+<option value='f9'>f9</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>cdargs</td><td class='sub right'>Jesse Keating</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/cdargs.git/'>summary</a><a href='/cgit/cdargs.git/refs/'>refs</a><a href='/cgit/cdargs.git/log/cdargs-1.35_format_security.patch'>log</a><a class='active' href='/cgit/cdargs.git/tree/cdargs-1.35_format_security.patch'>tree</a><a href='/cgit/cdargs.git/commit/cdargs-1.35_format_security.patch'>commit</a><a href='/cgit/cdargs.git/diff/cdargs-1.35_format_security.patch'>diff</a><a href='/cgit/cdargs.git/stats/cdargs-1.35_format_security.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/cdargs.git/log/cdargs-1.35_format_security.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/cdargs.git/tree/'>root</a>/<a href='/cgit/cdargs.git/tree/cdargs-1.35_format_security.patch'>cdargs-1.35_format_security.patch</a></div><div class='content'>blob: 3ddc550e607e9f908b891c7e3626ee256484607e (<a href='/cgit/cdargs.git/plain/cdargs-1.35_format_security.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+</pre></td>
+<td class='lines'><pre><code>diff --git a/src/cdargs.cc b/src/cdargs.cc
+index e505e4e..1fdfeb8 100644
+--- a/src/cdargs.cc
++++ b/src/cdargs.cc
+@@ -1301,7 +1301,7 @@ void helpscreen(void) {
+
+ void fatal_exit(char* msg) {
+ endwin();
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ exit(1);
+ }
+
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated by cgit v0.10.2 at 2015-06-21 13:46:50 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch
new file mode 100644
index 000000000000..d85a3b9b685c
--- /dev/null
+++ b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch
@@ -0,0 +1,20 @@
+ configure.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a21d664..263929e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -8,10 +8,11 @@ dnl if test "$has_curses" = "false" ; then
+ dnl AC_MSG_ERROR([Fatal error: couldn't find ncurses/curses.])
+ dnl fi
+
++PKG_CHECK_MODULES([NCURSES], [ncurses],[CURSES_LIB=${NCURSES_LIBS}],[
+ MP_WITH_CURSES
+ if test "x$CURSES_LIB" = "x" ; then
+ AC_MSG_ERROR([Fatal error: couldn't find ncurses/curses.])
+-fi
++fi])
+ AC_SUBST(CURSES_LIB)
+
+ AC_OUTPUT(Makefile contrib/Makefile doc/Makefile src/Makefile m4/Makefile cdargs.spec)
diff --git a/app-misc/cdargs/metadata.xml b/app-misc/cdargs/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/cdargs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/cdcat-0.3 b/app-misc/cdcat-0.3
deleted file mode 100644
index db5e3521db59..000000000000
--- a/app-misc/cdcat-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=virtual/cdrtools !app-backup/cdbkup
-DESCRIPTION=simple yet effective CD indexing program
-EAPI=0
-HOMEPAGE=https://dev.gentoo.org/~centic/cdcat/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/cdrtools !app-backup/cdbkup
-SLOT=0
-SRC_URI=mirror://gentoo/cdcat-0.3.tar.gz
-_md5_=304978d41b54910468357758180a3eb8
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
new file mode 100644
index 000000000000..b964640d32c6
--- /dev/null
+++ b/app-misc/cdcat/Manifest
@@ -0,0 +1,3 @@
+DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
+EBUILD cdcat-0.3.ebuild 1220 BLAKE2B 9bdec6ac62b4c2c51dbf5a7652adf90c75d459d45e4969a5b1866523f427d671917f935de3fac4847fc413104de53071db3c9bb975c9a240cc9b53ffc5d778a5 SHA512 98d1f7c4a0bd7ca6c06cbedc6323f2d40cee757c66bc8a6e9d88a86a3f202428dd8f3a681f2d82bbe91b5fb7723d7d44fb29eb1d9cea02e6aebb99fd2f0a1743
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
new file mode 100644
index 000000000000..e97b12414768
--- /dev/null
+++ b/app-misc/cdcat/cdcat-0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="simple yet effective CD indexing program"
+# original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="https://dev.gentoo.org/~centic/cdcat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="virtual/cdrtools
+ !app-backup/cdbkup"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # workaround install.sh ignoring --man_prefix
+ sed -i 's:^MAN_PREFIX:#:' install.sh
+
+ # fix path to cd index files to be FHS-compliant
+ sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl
+
+ # work around problem with isoinfo -di
+ sed -i 's:isoinfo -di:isoinfo -d -i:' src/cdcat.pl
+}
+
+src_install() {
+ # workaround install.sh ignoring --man_prefix
+ export MAN_PREFIX="${D}/usr/share/man"
+ dodir /usr/share/man/man1
+
+ # create index files path
+ dodir /var/lib/cdcat
+ chgrp cdrom "${D}"/var/lib/cdcat
+ chmod g+ws,o+w "${D}"/var/lib/cdcat
+
+ # now use the included install.sh
+ ./install.sh --prefix="${D}/usr" \
+ --man_prefix="${D}/usr/share/man" || die "Install script failed."
+
+ insinto /etc
+ doins doc/cdcat.conf || die
+}
diff --git a/app-misc/cdcat/metadata.xml b/app-misc/cdcat/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/cdcat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/cdctl-0.15 b/app-misc/cdctl-0.15
deleted file mode 100644
index 9b4268ab013f..000000000000
--- a/app-misc/cdctl-0.15
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Utility to control your cd/dvd drive
-EAPI=0
-HOMEPAGE=http://cdctl.sourceforge.net/
-KEYWORDS=x86 ppc amd64 ppc64
-LICENSE=free-noncomm
-SLOT=0
-SRC_URI=mirror://sourceforge/cdctl/cdctl-0.15.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=694558a113d1875264e8f44fa4284746
diff --git a/app-misc/cdctl-0.16 b/app-misc/cdctl-0.16
deleted file mode 100644
index 4f2f3aaae77a..000000000000
--- a/app-misc/cdctl-0.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utility to control your cd/dvd drive
-EAPI=5
-HOMEPAGE=http://cdctl.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=free-noncomm
-SLOT=0
-SRC_URI=mirror://sourceforge/cdctl/cdctl-0.16.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=12ee92e16bf944442e3947f992ffb3bc
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
new file mode 100644
index 000000000000..e4c6ec525a94
--- /dev/null
+++ b/app-misc/cdctl/Manifest
@@ -0,0 +1,8 @@
+AUX cdctl-0.15-Makefile.in.patch 1437 BLAKE2B 5fac19f5c356b0c8d983135f5f41da20182091b483aff423d4d4fdd4a813df9bb8592fc8933d9ab74d98594578546dd16956a1073b4b4ded4145d0fa583bb351 SHA512 c83243336a36b289ad5262a30b70d7db3bff0662a21e900f5a8696f784326ca4ffd709634c144f304970d0deb3f7e2fc9e0a947d465906db36c318df05883dd3
+AUX cdctl-0.15-cdc_ioctls.patch 646 BLAKE2B fb8d93854cccc1cd1b399ea529ea2611606bb68dfa2a8ad551e13b38a015c8fbe53a226d7a28e263844884a6ffe9130a3307d7789d0dc16a6e6a8da42df5518e SHA512 354241683f3bc4cf25101a984053473ea2fb67b445d09bb09eba2b657380a5393d918d892ee8c20e5fa8de77018931bca27b8dc0880f6fb3ad4ec1715fd51e75
+AUX cdctl-0.16-Makefile.in.patch 1474 BLAKE2B 436f47f59a21eea1785c70285532983854a445258eb7a91d01d1c5dc6cd29c4041b1d6999b61a56614bfe9d69bf6824823c783150dcef21a1fb1722ec7929601 SHA512 78d9c1a4b1e3c29fb9b83d6b9250e07157715fa70a00798f6bf49e0af2c2269dfec816df76f1818d401992b793504e8049df836bc0d8a73ab2f0488f4689b5e2
+DIST cdctl-0.15.tar.gz 44163 BLAKE2B f5f3f44fabdff4446eb5d6e3fdcb12f17a4d6ee57e90f4bb772c963d89fd7b22301a6f8ae3b4f4b38f57aabd27cd68a292b96849d66c2b77741d07e129d2a8c5 SHA512 7bcaec8f52cafbe84d87dcb740a952520ceccb197b1491a88bb03d6a993a6385d424f67386a7175bb30c5c8b3ac02abf31c2e8843c1cd7d1d808eee70a5906f4
+DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
+EBUILD cdctl-0.15.ebuild 700 BLAKE2B 1d66bd0b7393aca38e99f76383a6be950a9e0d03178a9910b5c86a67f0da84156f602576899fe1961b8c87ba96b24229c0c2b55afbf3108d00568ab95992e98c SHA512 935931345e30e6eee205a0e75961b322ba1b167942d7b0f810500c1e02c57b4ac99472029c05064204041d06da6fecf1f712c7d913da13f7d06d5e7af795dad8
+EBUILD cdctl-0.16.ebuild 535 BLAKE2B fbe68f74be781214cfb4c5c507cfbea0685b46c333d4c6674a83571d8930fb5250151cd612c55c068d4dcf5e947317192f7da666c64228e6386e6688e92b23aa SHA512 d4044b97a1b319304916f57f2c8fe381073c381453cf207a189aa953bf74cdb4ac97fd5ae722fd07a1c11ceaaddaf29c13d83e78dbdf5d41301d74b2879123bf
+MISC metadata.xml 242 BLAKE2B 965d7f590657a56f8d90dace39b217902fd1f1f834b1b61d6e4119b92f8a85c090afb74eedc5cd987ba809f193ddf4cbeb44ed27de98e7f96c3bdd4a2332eecd SHA512 289f7a2af6d7c9dc7733456dd71cdc014bd0dd13d84d76605aa3ae4ba4bc39cab188b744309c974c14a2780662761ba2670a44037b40f07394e65c55c985ac6d
diff --git a/app-misc/cdctl/cdctl-0.15.ebuild b/app-misc/cdctl/cdctl-0.15.ebuild
new file mode 100644
index 000000000000..59b947b72297
--- /dev/null
+++ b/app-misc/cdctl/cdctl-0.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to control your cd/dvd drive"
+HOMEPAGE="http://cdctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="x86 ppc amd64 ppc64"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-Makefile.in.patch
+ epatch "${FILESDIR}"/${P}-cdc_ioctls.patch
+}
+
+src_compile() {
+ econf
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc NEWS NUTSANDBOLTS PUBLICKEY README
+}
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
new file mode 100644
index 000000000000..3dff479be49b
--- /dev/null
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="Utility to control your cd/dvd drive"
+HOMEPAGE="http://cdctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.16-Makefile.in.patch
+
+ eautoreconf
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
diff --git a/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch
new file mode 100644
index 000000000000..6d8e11502fcc
--- /dev/null
+++ b/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch
@@ -0,0 +1,56 @@
+--- Makefile.in.orig 2003-02-20 21:57:38.000000000 -0800
++++ Makefile.in 2003-02-20 22:27:10.000000000 -0800
+@@ -2,10 +2,12 @@
+ CFLAGS=-Wall -g
+ BINS=cdctl sndreset
+ OBJS=cdctl.o version.o ioctls.o iso_header.o
+-DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
++DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README
+ MANS=cdctl.1
+ MOS=cdctl.mo
+
++prefix = @prefix@
++exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ mandir = @mandir@
+ datadir = @datadir@
+@@ -16,6 +18,10 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = $(INSTALL) -m 644
+
++DESTDIR =
++
++man1dir = $(mandir)/man1
++
+ all: $(BINS)
+
+ cdctl: $(OBJS)
+@@ -26,21 +32,21 @@
+ version.o: version.c
+ iso_header.o: iso_header.c
+
+-install: install-bins install-docs install-mans install-mos
++install: install-bins install-mans install-mos
+
+ install-bins: $(BINS)
+- $(INSTALL) -s $(BINS) $(bindir)
+-
+-install-docs: $(DOCS)
+- $(INSTALL_DATA) $(DOCS) $(datadir)
++ $(INSTALL) -d $(DESTDIR)$(bindir)
++ $(INSTALL) $(BINS) $(DESTDIR)$(bindir)
+
+ install-mans: $(MANS)
+- $(INSTALL_DATA) $(MANS) $(mandir)
++ $(INSTALL) -d $(DESTDIR)$(man1dir)
++ $(INSTALL_DATA) $(MANS) $(DESTDIR)$(man1dir)
+
+ # FIXME: need to deal with other languages besides German
+
+ install-mos: cdctl.mo
+- $(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES
++ $(INSTALL) -d $(DESTDIR)$(localedir)/de/LC_MESSAGES
++ $(INSTALL_DATA) $(MOS) $(DESTDIR)$(localedir)/de/LC_MESSAGES
+
+ cdctl.mo: cdctl.po
+ msgfmt cdctl.po -o cdctl.mo
diff --git a/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch b/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
new file mode 100644
index 000000000000..8e440955907b
--- /dev/null
+++ b/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
@@ -0,0 +1,13 @@
+diff -Naurp cdctl-0.15-orig/cdctl.c cdctl-0.15/cdctl.c
+--- cdctl-0.15-orig/cdctl.c 2006-08-08 23:18:44.000000000 +0200
++++ cdctl-0.15/cdctl.c 2006-08-08 23:19:33.000000000 +0200
+@@ -337,7 +337,9 @@ int do_print_capabilities(int cdrom) {
+ printf("Can report media change: %i\n", (ret & CDC_MEDIA_CHANGED)?1:0);
+ printf("Can play audio discs : %i\n", (ret & CDC_PLAY_AUDIO)?1:0);
+ printf("Can do a hard reset : %i\n", (ret & CDC_RESET)?1:0);
++#ifdef CDC_IOCTLS
+ printf("Has non-standard ioctls: %i\n", (ret & CDC_IOCTLS)?1:0);
++#endif
+ printf("Can report drive status: %i\n", (ret & CDC_DRIVE_STATUS)?1:0);
+
+ #ifdef CDROM_CHANGER_NSLOTS
diff --git a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
new file mode 100644
index 000000000000..f6f4ad3abdcf
--- /dev/null
+++ b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
@@ -0,0 +1,55 @@
+--- cdctl/Makefile.in
++++ cdctl/Makefile.in
+@@ -1,8 +1,8 @@
+ CC=gcc
+-CFLAGS=-Wall -g
++CFLAGS:=-Wall -g
+ BINS=cdctl sndreset
+ OBJS=cdctl.o version.o ioctls.o iso_header.o
+-DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
++DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README
+ # NOTE: all man pages are installed in $(mandir)/man1 -- see install-mans
+ MANS=cdctl.1
+ MOS=cdctl.mo
+@@ -22,6 +22,8 @@
+ INSTALL_DIR = $(INSTALL) -d
+ INSTALL_DATA = $(INSTALL) -m 644
+
++DESTDIR =
++
+ all: $(BINS)
+
+ cdctl: $(OBJS)
+@@ -35,25 +37,21 @@
+ indent:
+ indent -kr -cdb -sc *.c
+
+-install: install-bins install-docs install-mans install-mos
++install: install-bins install-mans install-mos
+
+ install-bins: $(BINS)
+- $(INSTALL_DIR) $(bindir)
+- $(INSTALL) -s $(BINS) $(bindir)
+-
+-install-docs: $(DOCS)
+- $(INSTALL_DIR) $(docdir)
+- $(INSTALL_DATA) $(DOCS) $(docdir)
++ $(INSTALL_DIR) $(DESTDIR)$(bindir)
++ $(INSTALL) $(BINS) $(DESTDIR)$(bindir)
+
+ install-mans: $(MANS)
+- $(INSTALL_DIR) $(mandir)/man1
+- $(INSTALL_DATA) $(MANS) $(mandir)/man1
++ $(INSTALL_DIR) $(DESTDIR)/$(mandir)/man1
++ $(INSTALL_DATA) $(MANS) $(DESTDIR)$(mandir)/man1
+
+ # FIXME: need to deal with other languages besides German
+
+ install-mos: cdctl.mo
+- $(INSTALL_DIR) $(localedir)/de/LC_MESSAGES
+- $(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES
++ $(INSTALL_DIR) $(DESTDIR)$(localedir)/de/LC_MESSAGES
++ $(INSTALL_DATA) $(MOS) $(DESTDIR)$(localedir)/de/LC_MESSAGES
+
+ cdctl.mo: cdctl.po
+ msgfmt cdctl.po -o cdctl.mo
diff --git a/app-misc/cdctl/metadata.xml b/app-misc/cdctl/metadata.xml
new file mode 100644
index 000000000000..0526b0e7ce4d
--- /dev/null
+++ b/app-misc/cdctl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">cdctl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/cdircmp-0.3-r1 b/app-misc/cdircmp-0.3-r1
deleted file mode 100644
index 28cd64e25ac9..000000000000
--- a/app-misc/cdircmp-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/ncurses-5.4 >=sys-apps/sed-4
-DESCRIPTION=Compare directories and select files to copy
-EAPI=2
-HOMEPAGE=http://home.hccnet.nl/paul.schuurmans/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.4
-SLOT=0
-SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4d8b8b8932711f5abc984e3d5be1a510
diff --git a/app-misc/cdircmp-0.3-r2 b/app-misc/cdircmp-0.3-r2
deleted file mode 100644
index 07656f8100b2..000000000000
--- a/app-misc/cdircmp-0.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Compare directories and select files to copy
-EAPI=7
-HOMEPAGE=http://home.hccnet.nl/paul.schuurmans/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.4:0=
-SLOT=0
-SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e40145e590833ed0c96ced79fb124d0f
diff --git a/app-misc/cdircmp/Manifest b/app-misc/cdircmp/Manifest
new file mode 100644
index 000000000000..872949edd513
--- /dev/null
+++ b/app-misc/cdircmp/Manifest
@@ -0,0 +1,4 @@
+DIST cdircmp-0.3.tar.gz 17253 BLAKE2B 090e73d2d60ff10e8ba01c77c172b6e4b4603c778f4ad8b29dbcedd8e214f54377c171bc964c14ab4f08dc8e995b5c6b55601f75977b35669cbcfb23d0c19fea SHA512 66fa27a3c06aa4bd6584da2c6a38ad0798f5f10eb9b021080c473d03733bd2dba344549e95c22485bf72536a03a4e91a7497192296b6c297166e47a679cf0079
+EBUILD cdircmp-0.3-r1.ebuild 756 BLAKE2B 85ff26a39b82cb2bcd1b6ad1ed8215ade2d1f986c63a75215db444598bb933510eeac73a6b42a52164e4c8053c97ad247051f4981faf5ccd81b50968cfaf2ed1 SHA512 1f208a84a06f735e3631ec55159528ab24712cf74228d9f8e7957d3383202c8953a40815ebf339b812cf41cc1323d2eab41194384b795533b5c78499be68325d
+EBUILD cdircmp-0.3-r2.ebuild 663 BLAKE2B 371d80aa2cb1f654a0bba24d9cf21a2d418184ca73fa067d5a542594d9f7d44433deeeaed0db98c7aad01fb7ca6ada50096ca40be452cce03a4468e3f4b4d872 SHA512 2be97f0c1bed5525e7f1bb04ad123dedd83c6d3894909fce94838605b12d157cbe594c4fa21fada0e8e859f361945dbcef9cad0f843530f08628c43296220c96
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
new file mode 100644
index 000000000000..f7851f0207a2
--- /dev/null
+++ b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Compare directories and select files to copy"
+HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
+SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.4"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4"
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ || die "emake failed"
+}
+
+src_install() {
+ dodoc AUTHORS ChangeLog README
+
+ dobin ${PN} || die "dobin failed"
+}
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
new file mode 100644
index 000000000000..ea5818e44538
--- /dev/null
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Compare directories and select files to copy"
+HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
+SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.4:0="
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+ default
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ einstalldocs
+ dobin ${PN}
+}
diff --git a/app-misc/cdircmp/metadata.xml b/app-misc/cdircmp/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/cdircmp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/cdspeed-0.4-r1 b/app-misc/cdspeed-0.4-r1
deleted file mode 100644
index 03f310599172..000000000000
--- a/app-misc/cdspeed-0.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Change the speed of your CD drive
-EAPI=2
-HOMEPAGE=http://linuxfocus.org/~guido/
-KEYWORDS=alpha amd64 ~hppa ~mips ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linuxfocus.org/~guido/cdspeed-0.4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8556149cb2bdd6ca65830c5a517b3373
diff --git a/app-misc/cdspeed/Manifest b/app-misc/cdspeed/Manifest
new file mode 100644
index 000000000000..8652e51922bd
--- /dev/null
+++ b/app-misc/cdspeed/Manifest
@@ -0,0 +1,3 @@
+DIST cdspeed-0.4.tar.gz 3696 BLAKE2B bb3072478897c202de3732bc75cf1a3306066e639f1b23daf275af8b7e627c7a6353a881a19606f155f3c6a0938c7a72171a7ee070e7313dc19265f5c1840daa SHA512 2f656c0a8269a568f10a499efb6414c217369d42dc6fee393ccfdbb69b89ab6e01dae2e3901049081a29b7a2bed857591f9ff8b2855aa6e325b85aecba2e2b37
+EBUILD cdspeed-0.4-r1.ebuild 691 BLAKE2B 7872adab9e2355d257e819f9b4d4529c850a3809ff8f39e22a640856b50324d0293dd852219a4639164b38bcf69a538e1ddc07ff8179c7b317c9041bcbc7f63f SHA512 6a66a0206ab6628bde4b24878390249830e327c3e07e5917107e7df1d0660ed3d956d46e813f33f39ff6610ddf16b0a0e08d8c0d43ff18b358e27ff345313536
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdspeed/cdspeed-0.4-r1.ebuild b/app-misc/cdspeed/cdspeed-0.4-r1.ebuild
new file mode 100644
index 000000000000..9701b686d358
--- /dev/null
+++ b/app-misc/cdspeed/cdspeed-0.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Change the speed of your CD drive"
+HOMEPAGE="http://linuxfocus.org/~guido/"
+SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND=""
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile failed"
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS} -Wall -Wno-unused" CC=$(tc-getCC) \
+ || die "emake failed"
+}
+
+src_install() {
+ emake PREFIX="${D}/usr" install || die "emake install"
+ dodoc README
+}
diff --git a/app-misc/cdspeed/metadata.xml b/app-misc/cdspeed/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/cdspeed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/chkcrontab-1.6 b/app-misc/chkcrontab-1.6
deleted file mode 100644
index 1bda2fa89a80..000000000000
--- a/app-misc/chkcrontab-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A tool to detect crontab errors
-EAPI=6
-HOMEPAGE=https://github.com/lyda/chkcrontab
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.6.tar.gz -> chkcrontab-1.6.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=565ec97b39912065880fa5fafebdc430
diff --git a/app-misc/chkcrontab-1.7 b/app-misc/chkcrontab-1.7
deleted file mode 100644
index 2f8c92407626..000000000000
--- a/app-misc/chkcrontab-1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool to detect crontab errors
-EAPI=6
-HOMEPAGE=https://github.com/lyda/chkcrontab
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4056d971ff0094c5635dbd96cad496a7
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
new file mode 100644
index 000000000000..34b5d2fc8b7a
--- /dev/null
+++ b/app-misc/chkcrontab/Manifest
@@ -0,0 +1,5 @@
+DIST chkcrontab-1.6.tar.gz 24701 BLAKE2B a4a47e0e41a17a535662b22deb57dd49b461694f4842a59a1a9debe8523f4216f4834c64d01c62e24e13ee4d45e526f361650b402968a164b2802e0a13d63a63 SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b
+DIST chkcrontab-1.7.tar.gz 25088 BLAKE2B 5e3cffcbcd064cfe8e9898dc74c215b14bdd69a4c110a91b73777cb024dd6dfe8d10ce862e82752baad65a8daf88dc45bee06f8e736393e0f973ee2f79f7bd96 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0
+EBUILD chkcrontab-1.6.ebuild 528 BLAKE2B c90cddccd32141129a7e263eaf4bcfefa07589745ae30df8359ef77825b3028660229e34996846787baaa863c2d8cae71215cf05e75eff3ae59c3b8b43c9fabf SHA512 4b032d1dfa0247d66f1c65a528176c816cc6ac8cb1f3e37e553547f41f0e8ea2050ad62f8497d5e059e47e0a6d796c95b252f1f4647c8cb60a47935785f5dbdd
+EBUILD chkcrontab-1.7.ebuild 539 BLAKE2B 09d120d685a46505a5d127ca7b56300b1f26fc7e41191bbd2306e775db9e8068b2e5ff62b55f1c293d984f9660c0879c816136ceee1c4b3fe81832f615d8634c SHA512 e178bb05433fa686eaff24a76c1552538199acba20258adbf28773d996f491e95a97a321a6887f4d62ee075d62a57f78f5b90f1ad3976b254d97d5c7bfb99c6c
+MISC metadata.xml 463 BLAKE2B 82e0b38cdc6aeb0cb304f3448f326c129e5b936ff559e07e5ced9b1b72e840cc4f1573571eae46cc56639f6920e717e7d3f67eef6cf8aac5e9a11f5948ac70ca SHA512 d181e1a0b06519224d4e6b13b7157bd9741000c676e7f47c72dd27eb475d991a32480393bd62a599fb0a833908bae96b810fbdb17723723067edc6af3b3ab0ca
diff --git a/app-misc/chkcrontab/chkcrontab-1.6.ebuild b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
new file mode 100644
index 000000000000..bd45b594bf28
--- /dev/null
+++ b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to detect crontab errors"
+HOMEPAGE="https://github.com/lyda/chkcrontab"
+SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ doman doc/${PN}.1
+ distutils-r1_python_install_all
+}
diff --git a/app-misc/chkcrontab/chkcrontab-1.7.ebuild b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
new file mode 100644
index 000000000000..b188e6979af1
--- /dev/null
+++ b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to detect crontab errors"
+HOMEPAGE="https://github.com/lyda/chkcrontab"
+SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+python_test() {
+ esetup.py test || die
+}
+
+python_install_all() {
+ doman doc/${PN}.1
+ distutils-r1_python_install_all
+}
diff --git a/app-misc/chkcrontab/metadata.xml b/app-misc/chkcrontab/metadata.xml
new file mode 100644
index 000000000000..d69c349ca9a7
--- /dev/null
+++ b/app-misc/chkcrontab/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomáš Mózes</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">lyda/chkcrontab</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ckb-0.2.6-r1 b/app-misc/ckb-0.2.6-r1
deleted file mode 100644
index 5486cd7d6403..000000000000
--- a/app-misc/ckb-0.2.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/pkgconfig
-DESCRIPTION=Corsair K65/K70/K95 Driver
-EAPI=5
-HOMEPAGE=https://github.com/ccMSC/ckb
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/ccMSC/ckb/archive/v0.2.6.tar.gz -> ckb-0.2.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0028a08d84b83392dc6d195342abec30
diff --git a/app-misc/ckb-0.2.9 b/app-misc/ckb-0.2.9
deleted file mode 100644
index 6524119797f4..000000000000
--- a/app-misc/ckb-0.2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/pkgconfig
-DESCRIPTION=Corsair K65/K70/K95 Driver
-EAPI=5
-HOMEPAGE=https://github.com/ckb-next/ckb-next
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.2.9.tar.gz -> ckb-0.2.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=0dc5442e630670c30957ee5a9fa93473
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
new file mode 100644
index 000000000000..27514c0c2370
--- /dev/null
+++ b/app-misc/ckb/Manifest
@@ -0,0 +1,6 @@
+AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
+DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
+DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
+EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
+EBUILD ckb-0.2.9.ebuild 1115 BLAKE2B 0baa0ffa72e1f9324fa4fa71eef92cdbfbe438f1f7a03519a5f39715930bc7ef4103c7280feeee9a2b2329d6f4ec6a128b869bb5b0fd1e78a710ebb49f52c8f1 SHA512 8a37d8d0814a59d5667de0726e6fbf4890fac2718a046027083e20339f5df69de5175b0b3b7370b3590d7751979ed688f179faf46b3bcb7b05f331fe418e9ae4
+MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
diff --git a/app-misc/ckb/ckb-0.2.6-r1.ebuild b/app-misc/ckb/ckb-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..e9ac7cbbdb3c
--- /dev/null
+++ b/app-misc/ckb/ckb-0.2.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ccMSC/ckb"
+SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md BUILD.md DAEMON.md )
+
+src_prepare() {
+ sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
+ sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ dobin bin/ckb bin/ckb-daemon
+ dodir /usr/bin/ckb-animations
+ exeinto /usr/bin/ckb-animations
+ doexe bin/ckb-animations/*
+
+ newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+ domenu usr/ckb.desktop
+ doicon usr/ckb.png
+ systemd_dounit service/systemd/ckb-daemon.service
+}
diff --git a/app-misc/ckb/ckb-0.2.9.ebuild b/app-misc/ckb/ckb-0.2.9.ebuild
new file mode 100644
index 000000000000..0516a27502af
--- /dev/null
+++ b/app-misc/ckb/ckb-0.2.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot qmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md BUILD.md DAEMON.md )
+
+src_prepare() {
+ sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
+ sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
+ sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ dobin bin/ckb bin/ckb-daemon
+ dodir /usr/bin/ckb-animations
+ exeinto /usr/libexec/ckb-animations
+ doexe bin/ckb-animations/*
+
+ newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+ domenu usr/ckb.desktop
+ doicon usr/ckb.png
+ systemd_dounit service/systemd/ckb-daemon.service
+}
diff --git a/app-misc/ckb/files/ckb.initd b/app-misc/ckb/files/ckb.initd
new file mode 100644
index 000000000000..76af0fd8438b
--- /dev/null
+++ b/app-misc/ckb/files/ckb.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+## Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+command="/usr/bin/ckb-daemon"
+description="Controller for Corsair Keyboard Driver"
+pidfile="/run/ckb.pid"
+logfile="/var/run/ckb.log"
+
+start() {
+ ebegin "Starting Corsair Keyboard Driver"
+ start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}" --background \
+ --stdout "${logfile}" --stderr "${logfile}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Corsair Keyboard Driver"
+ start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}"
+ eend $?
+
+}
+
+reload() {
+ stop
+ sleep 3
+ start
+}
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
new file mode 100644
index 000000000000..cb945f500083
--- /dev/null
+++ b/app-misc/ckb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ccMSC/ckb</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ckermit-8.0.211-r4 b/app-misc/ckermit-8.0.211-r4
deleted file mode 100644
index 2cf4a5d3dc86..000000000000
--- a/app-misc/ckermit-8.0.211-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
-DESCRIPTION=combined serial and network communication software package
-EAPI=5
-HOMEPAGE=http://www.kermitproject.org/
-IUSE=ncurses
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
-LICENSE=Kermit
-RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) net-dialup/lrzsz
-SLOT=0
-SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b0a51033117266c6a8b436f0a46e7b37
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
new file mode 100644
index 000000000000..5be4a90802a6
--- /dev/null
+++ b/app-misc/ckermit/Manifest
@@ -0,0 +1,5 @@
+AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
+AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
+DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
+EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
+MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
new file mode 100644
index 000000000000..9d8950eb448b
--- /dev/null
+++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit versionator eutils flag-o-matic toolchain-funcs
+
+# Columbia University only uses the third component, e.g. cku211.tar.gz for
+# what we would call 8.0.211.
+MY_P="cku$( get_version_component_range 3 ${PV} )"
+
+DESCRIPTION="combined serial and network communication software package"
+SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
+HOMEPAGE="http://www.kermitproject.org/"
+
+LICENSE="Kermit"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
+RDEPEND="${DEPEND}
+ net-dialup/lrzsz"
+
+S=${WORKDIR}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cleanup.patch
+ epatch "${FILESDIR}"/${P}-build-wart.patch
+ tc-export_build_env BUILD_CC
+ sed -i -r \
+ -e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
+ -e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
+ makefile || die
+}
+
+src_compile() {
+ # we don't enable any of the telnet/ftp authentication stuff
+ # since there are other packages which do these things better
+ # USE="kerberos pam shadow ssl zlib"
+ append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
+
+ if use ncurses; then
+ append-cppflags "-DCK_NCURSES"
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+ append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+ fi
+
+ append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
+ append-cppflags -DHAVE_CRYPT_H
+ emake \
+ CC="$(tc-getCC)" \
+ KFLAGS="${CPPFLAGS}" \
+ LIBS="-lcrypt -lresolv ${LIBS}" \
+ LNKFLAGS="${LDFLAGS}" \
+ linuxa
+}
+
+src_install() {
+ dodir /usr/bin /usr/share/man/man1
+ emake \
+ DESTDIR="${ED}" \
+ BINDIR=/usr/bin \
+ MANDIR="${ED}"/usr/share/man/man1 \
+ MANEXT=1 \
+ install
+ dodoc *.txt
+
+ # make the correct symlink
+ rm "${ED}"/usr/bin/kermit-sshsub || die
+ dosym kermit /usr/bin/kermit-sshsub
+
+ # the ckermit.ini script is calling the wrong kermit binary --
+ # the one from ${D}
+ sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
+}
diff --git a/app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch b/app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch
new file mode 100644
index 000000000000..59f28a9e5cc7
--- /dev/null
+++ b/app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch
@@ -0,0 +1,23 @@
+the wart util is used at build time only, so use BUILD_* so we can cross-compile
+
+--- a/makefile
++++ b/makefile
+@@ -1406,12 +1406,17 @@
+
+ ckctel.$(EXT): ckcsym.h ckcdeb.h ckcker.h ckcnet.h ckctel.h ckclib.h
+
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS)
++BUILD_CPPFLAGS ?= $(CPPFLAGS)
++BUILD_LDFLAGS ?= $(LDFLAGS)
+ wart: ckwart.$(EXT)
+- $(CC) $(LNKFLAGS) -o wart ckwart.$(EXT) $(LIBS)
++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o wart ckwart.$(EXT) $(BUILD_LDFLAGS)
+
+ ckcmdb.$(EXT): ckcmdb.c ckcdeb.h ckcsym.h ckclib.h
+
+ ckwart.$(EXT): ckwart.c
++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ -c $<
+
+ ckudia.$(EXT): ckudia.c ckcker.h ckcdeb.h ckucmd.h ckcasc.h ckcsym.h ckcsig.h \
+ ckcnet.h ckctel.h ckclib.h
diff --git a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
new file mode 100644
index 000000000000..5b7c1ed6b951
--- /dev/null
+++ b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
@@ -0,0 +1,78 @@
+clean up missing prototypes and broken printfs
+
+--- a/ckcmai.c
++++ b/ckcmai.c
+@@ -623,6 +623,8 @@ ACKNOWLEDGMENTS:
+ #include "ckntap.h"
+ #endif /* NT */
+
++#include <time.h>
++
+ #ifndef NOSERVER
+ /* Text message definitions.. each should be 256 chars long, or less. */
+ #ifdef MINIX
+--- a/ckufio.c
++++ b/ckufio.c
+@@ -40,6 +40,7 @@ char *ckzv = "UNIX File support, 8.0.200, 4 Mar 2004";
+ #include "ckcsym.h"
+ #include "ckcdeb.h"
+ #include "ckcasc.h"
++#include "ckuusr.h"
+
+ #ifndef NOCSETS
+ #include "ckcxla.h"
+@@ -1803,6 +1804,8 @@ zxin(n,s,x) int n, x; char *s; {
+ return(fread(s, sizeof (char), x, fp[n]));
+ }
+
++extern int ttwait(int fd, int secs);
++
+ /*
+ Z I N F I L L -- Buffered file input.
+
+--- a/ckutio.c
++++ b/ckutio.c
+@@ -1808,6 +1808,11 @@ ttgwsiz() {
+ #endif /* NONAWS */
+ }
+
++#ifdef CK_NAWS /* Negotiate About Window Size */
++#ifdef RLOGCODE
++_PROTOTYP( int rlog_naws, (void) );
++#endif /* RLOGCODE */
++#endif /* CK_NAWS */
+
+ #ifndef NOSIGWINCH
+ #ifdef SIGWINCH
+--- a/ckuus5.c
++++ b/ckuus5.c
+@@ -7747,7 +7747,7 @@ doshow(x) int x; {
+ printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
+ printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
+ printf(" --cdmessage:%d\n",srvcdmsg);
+- printf(" --helpfile:%d\n",helpfile);
++ printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
+ if (inserver) {
+ printf("\n");
+ break;
+--- a/ckuus7.c
++++ b/ckuus7.c
+@@ -2981,7 +2981,7 @@ dopurge() { /* Do the PURGE command */
+ if (n < tokeep) { /* Not deleting any */
+ count = 0;
+ if (listing)
+- printf(" Matches = %d: Not enough to purge.\n");
++ printf(" Matches = %d: Not enough to purge.\n", n);
+ goto xpurge;
+ }
+
+--- a/ckuusx.c
++++ b/ckuusx.c
+@@ -56,7 +56,6 @@
+ #include <termcap.h>
+ #endif /* NOHTERMCAP */
+ #endif /* BSD44 */
+-#else /* !BSD44 */
+ #ifdef linux
+ #include <term.h>
+ #endif /* linux */
diff --git a/app-misc/ckermit/metadata.xml b/app-misc/ckermit/metadata.xml
new file mode 100644
index 000000000000..e248196b07c4
--- /dev/null
+++ b/app-misc/ckermit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/clockywock-0.3.1a b/app-misc/clockywock-0.3.1a
deleted file mode 100644
index 7e1c5115c0b3..000000000000
--- a/app-misc/clockywock-0.3.1a
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=ncurses based analog clock
-EAPI=6
-HOMEPAGE=https://soomka.com/clockywock
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://soomka.com/clockywock-0.3.1a.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=96744eaa0fa59d1c29abe9a6f1a42b81
diff --git a/app-misc/clockywock/Manifest b/app-misc/clockywock/Manifest
new file mode 100644
index 000000000000..cb0d0dc130ef
--- /dev/null
+++ b/app-misc/clockywock/Manifest
@@ -0,0 +1,4 @@
+AUX clockywock-0.3.1a-makefile.patch 264 BLAKE2B de6b34cc77f3310f1e1942d6c71f5b024eaa033aad11261d8719c86d63697986f503afd28e3398c9aa34e979b79cc0190b57b7a40aca1ca00da816f1caf62b74 SHA512 a60c4c987cdaca2bea2afda3f1d208489e2f3c6701e162d9f051ac9ffb212116749d3d3cf7155ef86f79e4a4ee818970bda29a07bfe0881342a59f51c6cbfbfb
+DIST clockywock-0.3.1a.tar.gz 15004 BLAKE2B 8b2838a1aab735243c8fd663bfb96a668f5efdba59b4e18ab10e5d365b539b26d915d384433441d0d37e4a9291920267a0a091b4b7d1e5002e72ab6b37e2b495 SHA512 1d4f6e0a2e9cd8f459346aa4778ed4da0f1ce8e2b0b8bfed97a90c286d79199cefa609976c6d6139f1acdaccfc07f5f84e46d2f54e397ff8e9b2b450d06399a9
+EBUILD clockywock-0.3.1a.ebuild 578 BLAKE2B f4ea4911e47c85033f2cbfc61b3c111167c0a716ca1bf3f18342420f239c232e7e8910bc93573094a9c67b8824a2cf0a1898c672afe8d274725f1e691ca870c2 SHA512 13f7c180cca8aa6cd052a52324b29ecfc441be786e5fdb8c3d27f94f187793e6a4827932bc6620f94700d10339356da1c4a16117be856ad5d54d529c37a94b60
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild
new file mode 100644
index 000000000000..26f1be9445c7
--- /dev/null
+++ b/app-misc/clockywock/clockywock-0.3.1a.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="ncurses based analog clock"
+HOMEPAGE="https://soomka.com/clockywock"
+SRC_URI="https://soomka.com/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_prepare() {
+ # Respect compiler
+ tc-export CXX
+
+ default_src_prepare
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.7
+ dodoc README CREDITS
+}
diff --git a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
new file mode 100644
index 000000000000..e6f5bd510dc3
--- /dev/null
+++ b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,6 @@
++LIBS += -lncurses -lpthread
+ all:
+- g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o clockywock clockywock.cpp $(LIBS)
+
+ # install is done completely lazily
+ install:
diff --git a/app-misc/clockywock/metadata.xml b/app-misc/clockywock/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/app-misc/clockywock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/cmatrix-1.2a-r3 b/app-misc/cmatrix-1.2a-r3
deleted file mode 100644
index 3ef6090fd53d..000000000000
--- a/app-misc/cmatrix-1.2a-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=X? ( x11-apps/mkfontdir ) sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/cmatrix/
-IUSE=X
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=X? ( x11-apps/mkfontdir ) sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/cmatrix/cmatrix-1.2a.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d241b662dbf7c4aa68f34b02c98b03fe
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
new file mode 100644
index 000000000000..66b47ac45fa2
--- /dev/null
+++ b/app-misc/cmatrix/Manifest
@@ -0,0 +1,6 @@
+AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb9334ab88a0e271ae0890b1fd3637400ab4e9bcf63e09741072a1bf81b34ce8b62392a166596f2ad08a1bddd916415df SHA512 fe3ffc7919576c2f1fe16240ed6915431fcbe569c16b629cfbb78d082c47c44b95808c89bec7b09201902a19f780577f0dc382d4da7275f2f096c034efeeb14a
+AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8b5974657b267699cb111e9dc02dd1106d4effdbc2b13cc34273f591e2eb1d4d33ff508907f98d65f687b3046a9e SHA512 a72651c778fae74d0b05f59a7a94bf7a9807be0367dbceef9086d9a94da0062ab9f727c6708f5a573450c8e28fcbf729828ff4c8813b68a0fbfbf9106f451c92
+AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
+DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
+EBUILD cmatrix-1.2a-r3.ebuild 982 BLAKE2B 0a2dec12a99b9d437f51f0a8ec0d1cd33bcfdbd735f8b4f0dde4a051117e99c44cced188f20b2cf148cdec3063b8099a75fcadd90913c9a3afcb2d1936b4dba1 SHA512 60657881884e4fa0bc5685aab5e75a2c9beaa70311f568be22dc5c5e374dc1b33c5096d59454877998d945759fad573b6bcf473ef4180d1f095c0703880c65ce
+MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
new file mode 100644
index 000000000000..86d198d57acd
--- /dev/null
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
+HOMEPAGE="https://sourceforge.net/projects/cmatrix/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE="X"
+
+DEPEND="
+ X? ( x11-apps/mkfontdir )
+ sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+ default
+
+ use X && eapply "${FILESDIR}"/${P}-fontdir.patch
+
+ eautoreconf
+}
+
+src_install() {
+ dodir /usr/share/consolefonts
+ dodir /usr/lib/kbd/consolefonts
+ use X && dodir /usr/share/fonts/misc
+
+ default
+}
+
+pkg_postinst() {
+ if use X; then
+ if [[ -d "${ROOT}"usr/share/fonts/misc ]] ; then
+ einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
+ mkfontdir "${ROOT}"usr/share/fonts/misc
+ fi
+ fi
+}
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch b/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
new file mode 100644
index 000000000000..6e69841b5e01
--- /dev/null
+++ b/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
@@ -0,0 +1,28 @@
+diff -Naru cmatrix-1.2a.orig/Makefile.am cmatrix-1.2a/Makefile.am
+--- cmatrix-1.2a.orig/Makefile.am 2008-12-24 02:37:43.000000000 +0000
++++ cmatrix-1.2a/Makefile.am 2008-12-24 02:50:08.000000000 +0000
+@@ -18,20 +18,9 @@
+ $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
+ $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
+ fi
+- @if test -d /usr/lib/X11/fonts/misc; then \
+- echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
+- echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
+- echo " Done. If this is the first time you have installed CMatrix you will"; \
++ @if test -d /usr/share/fonts/misc; then \
++ echo " Installing X window matrix fonts in $(DESTDIR)/usr/share/fonts/misc..."; \
++ $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
++ echo " If this is the first time you have installed CMatrix you will"; \
+ echo " probably have to restart X window in order to use the mtx.pcf font."; \
+- else \
+- if test -d /usr/X11R6/lib/X11/fonts/misc; then \
+- echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
+- echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
+- echo " Done. If this is the first time you have installed CMatrix you will"; \
+- echo " probably have to restart X window in order to use the mtx.pcf font."; \
+- fi \
+ fi
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch
new file mode 100644
index 000000000000..5f88cd0fa876
--- /dev/null
+++ b/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch
@@ -0,0 +1,48 @@
+diff -urN cmatrix-1.2a.old/Makefile.am cmatrix-1.2a/Makefile.am
+--- cmatrix-1.2a.old/Makefile.am Sun Mar 31 17:17:17 2002
++++ cmatrix-1.2a/Makefile.am Sat Jul 6 05:32:06 2002
+@@ -9,30 +9,28 @@
+
+ install-data-local:
+ @if test -d /usr/share/consolefonts; then \
+- echo " Installing matrix fonts in /usr/share/consolefonts..."; \
+- $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
+- $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \
++ echo " Installing matrix fonts in $(DESTDIR)/usr/share/consolefonts..."; \
++ $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \
++ $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/share/consolefonts; \
+ fi
+ @if test -d /usr/lib/kbd/consolefonts; then \
+- echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
+- $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
+- $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \
++ echo " Installing matrix fonts in $(DESTDIR)/usr/lib/kbd/consolefonts..."; \
++ $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
++ $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
+ fi
+ @if test -d /usr/lib/X11/fonts/misc; then \
+- echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
+- echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
+- $(MKFONTDIR) /usr/lib/X11/fonts/misc; \
++ echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
++ $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
++ $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
++ echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
+ echo " Done. If this is the first time you have installed CMatrix you will"; \
+ echo " probably have to restart X window in order to use the mtx.pcf font."; \
+ else \
+ if test -d /usr/X11R6/lib/X11/fonts/misc; then \
+- echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
+- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
+- echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
+- $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \
++ echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
++ $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
++ $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
++ echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
+ echo " Done. If this is the first time you have installed CMatrix you will"; \
+ echo " probably have to restart X window in order to use the mtx.pcf font."; \
+ fi \
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
new file mode 100644
index 000000000000..60720c7da8b9
--- /dev/null
+++ b/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
@@ -0,0 +1,33 @@
+--- a/configure.in
++++ b/configure.in
+@@ -8,9 +8,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+
+-dnl Checks for libraries.
+-dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncurses, main)
++PKG_PROG_PKG_CONFIG
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -26,18 +24,7 @@
+
+ AC_CHECK_HEADERS(curses.h ncurses.h)
+
+-CURSES_LIB_NAME=""
+-AC_CHECK_LIB(ncurses, tgetent, CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses)
+-
+-if eval "test x$CURSES_LIB_NAME = x"
+-then
+- AC_CHECK_LIB(curses, tgetent, CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses)
+-fi
+-
+-if eval "test x$CURSES_LIB_NAME = x"
+-then
+- AC_CHECK_LIB(termcap, tgetent, CURSES_LIB="-ltermcap" CURSES_LIB_NAME=termcap)
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS";CURSES_LIB_NAME=ncurses])
+
+ if eval "test x$CURSES_LIB_NAME = x"
+ then
diff --git a/app-misc/cmatrix/metadata.xml b/app-misc/cmatrix/metadata.xml
new file mode 100644
index 000000000000..fed47a353275
--- /dev/null
+++ b/app-misc/cmatrix/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type='person'>
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/color-1.2-r2 b/app-misc/color-1.2-r2
deleted file mode 100644
index f3a2f7319905..000000000000
--- a/app-misc/color-1.2-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Easily add ANSI colouring to shell scripts
-EAPI=6
-HOMEPAGE=http://www.runslinux.net/?page_id=10
-KEYWORDS=alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://runslinux.net/projects/color/color-1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90cbbd34e1ef39d941749946c0b2febe
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
new file mode 100644
index 000000000000..09671a68b029
--- /dev/null
+++ b/app-misc/color/Manifest
@@ -0,0 +1,4 @@
+AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
+DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
+EBUILD color-1.2-r2.ebuild 900 BLAKE2B 6957a36ac51ab4e082e7738ecce00a8e760da19dd04048b9ab0822eb0931114d5839e6f0ce195550bceefc69279c4259715ea350f34f8558fa18129720c86ac6 SHA512 d033d6fde544788f6867636f7ef0222c8edec1f5ccf5d5327caa843a48f0a30ec610732f08fa536e033793b707049e6ea05810206cc47e028761984a869ed92c
+MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
new file mode 100644
index 000000000000..198bbcc3a821
--- /dev/null
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Easily add ANSI colouring to shell scripts"
+HOMEPAGE="http://www.runslinux.net/?page_id=10"
+SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PV}-ldflags.patch
+ default
+ tc-export CC
+}
+
+src_install() {
+ dobin color
+ dodoc CHANGELOG README
+
+ # symlink for british users.
+ dosym color /usr/bin/colour
+}
+
+pkg_postinst() {
+ elog "For information on using colour in your shell scripts,"
+ elog "run \`color\` without any arguments."
+ elog
+ elog "To see all the colours available, use this command"
+ elog " $ color --list"
+ elog
+ elog "More examples are available in ${EPREFIX}/usr/share/doc/${PF}."
+}
diff --git a/app-misc/color/files/1.2-ldflags.patch b/app-misc/color/files/1.2-ldflags.patch
new file mode 100644
index 000000000000..9c95eda73b0e
--- /dev/null
+++ b/app-misc/color/files/1.2-ldflags.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 79c5b33..452e091 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CC = cc
++CC ?= cc
+ #CFLAGS = -W -Wall -O2 -g
+ INCLUDE = $(wildcard *.h)
+ OBJS = color.o
+@@ -6,8 +6,11 @@ EXE = color
+
+ all: $(EXE)
+
++OBJS: color.c
++ $(CC) $(CFLAGS) -c $^ $@
++
+ $(EXE): $(OBJS)
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^
+
+ install: all
+ cp $(EXE) /usr/local/bin
diff --git a/app-misc/color/metadata.xml b/app-misc/color/metadata.xml
new file mode 100644
index 000000000000..7a2823d5e0fc
--- /dev/null
+++ b/app-misc/color/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Color is a nifty little utility that you can call from shell scripts,
+ that will let you easily use ANSI escape codes (for colors, bold,
+ underline, etc) to your shell scripts without having to memorize escape
+ sequences and type it every time you want a little red...
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/colordiff-1.0.18 b/app-misc/colordiff-1.0.18
deleted file mode 100644
index b1eefac334f3..000000000000
--- a/app-misc/colordiff-1.0.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Colorizes output of diff
-EAPI=6
-HOMEPAGE=https://www.colordiff.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl sys-apps/diffutils
-SLOT=0
-SRC_URI=https://www.colordiff.org/colordiff-1.0.18.tar.gz
-_eclasses_=prefix e51c7882b7b721e54e684f7eb143cbfe
-_md5_=f834c327224f1669ec6e57fd4ae5aaba
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
new file mode 100644
index 000000000000..6c931a632b88
--- /dev/null
+++ b/app-misc/colordiff/Manifest
@@ -0,0 +1,3 @@
+DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
+EBUILD colordiff-1.0.18.ebuild 947 BLAKE2B 79867fdd66e1e1f07afe1aa61d1608ece43c3e47716cb2a2c957d3aaace77478f6fb0b189cbc81c0466f6a92c3cf6ddd20ffd64ef8440205764dc87813614409 SHA512 f043511ece20f661ad4021231530317fc6f058421d8e809e54037bad0a5b8dffcda88f3d10a6bdecf42761eaaeb01faa9fca054a2f525c4d53c71aeb9cc22ec2
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
new file mode 100644
index 000000000000..c09e21e5b17f
--- /dev/null
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="Colorizes output of diff"
+HOMEPAGE="https://www.colordiff.org/"
+SRC_URI="https://www.colordiff.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ dev-lang/perl
+ sys-apps/diffutils"
+
+src_prepare() {
+ default
+
+ # set proper etcdir for Gentoo Prefix
+ sed \
+ -e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" \
+ -i "${S}/colordiff.pl" || die "sed etcdir failed"
+ eprefixify "${S}"/colordiff.pl
+}
+
+# This package has a makefile, but we don't want to run it
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}{.pl,}
+ dobin cdiff.sh
+ insinto /etc
+ doins colordiffrc{,-lightbg,-gitdiff}
+ dodoc BUGS CHANGES README
+ doman {cdiff,colordiff}.1
+}
diff --git a/app-misc/colordiff/metadata.xml b/app-misc/colordiff/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/colordiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/conmux-0.15.1-r3 b/app-misc/conmux-0.15.1-r3
deleted file mode 100644
index 5d3e1df06799..000000000000
--- a/app-misc/conmux-0.15.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A console multiplexor
-EAPI=5
-HOMEPAGE=https://github.com/autotest/autotest
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/IO-Multiplex dev-perl/URI dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/conmux-0.15.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8280378113f25868b549af4eec4dc06a
diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
new file mode 100644
index 000000000000..a72e8f14e2e4
--- /dev/null
+++ b/app-misc/conmux/Manifest
@@ -0,0 +1,7 @@
+AUX conmux-registry.confd 120 BLAKE2B ee736a35e4b05a71030a1119b9fefd1c2e206234547cecc9f378d614788bb1faf5d555c54a8681b230374aaa75c11c1092c263daf75a624deece5b6b9313c429 SHA512 aeae7f7d127d67e5ae96a63fbd694624d599fd329698ea72bd0fb5a4a0d29df3d60c5bdd750431acf13a36f53960af477b483a48324540eda5a4b55b266c081c
+AUX conmux-registry.initd 886 BLAKE2B 8d895a7743faa2868ec0ae301c9b727e9b1d4f02cb222dff71dedb12b169f1416af89494fd6cf4c80e9ac8a02234a657eeca52f0ab0f9919f6c2941a4a1a1b7e SHA512 cbe93f419d244eef30e5662d34de9afb683ba9e69107fb3d5a78e2c6f31b5868ec6e4b35ab23597650d9593ad60c91d9c839e85c6589ebf5e17a70129dd2b3a3
+AUX conmux.confd 432 BLAKE2B 6dd0169032c849f1c131cfa0409430689249919cd8015f7f59c2fbadaf3da3ec92ca67c7b0a738a8d243911e06909d831da711c5fc46f1725638c208afcdc30f SHA512 50c6640f231e878817f31f399e8345d82c26bacbc8648d78b444eb572e7fad4c19d1f5b517474c412031dc65345723bffe95358542a6dd4af99a3007d12a7bc0
+AUX conmux.initd 892 BLAKE2B 3a724a77e47f4e0b8ac77581fdcd8f2be0aedbe6a71557f19eaba1517948736263fa36192dd3fbd8a2eb3db4ec5ad90c964b94fa01b1a3c00a12152b14edad8a SHA512 68a15b73bef6ee90504fe5a910d587ae6aad5735082af3dda3f390b66d87ac121fc8b1a846d7fce0432b6d4f06a9c355d881303f9586ea6497c64c0080798098
+DIST conmux-0.15.1.tar.gz 50713 BLAKE2B d764d63f03318614ad0d7088911dee02fbd36d24da7dc988bb3db03cda3e60c5b185f50b5545b086e2a3a7b278aa47af7bfd211c39c88f7ada32e83666eea0c5 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107
+EBUILD conmux-0.15.1-r3.ebuild 1993 BLAKE2B 7c291575b489396038573dffbe566b1d901fc0376fd70636466410f729c9cf23557d834d03bcbcecc5b2e4389da8fb282af4a815c46c87dd163243f9a10c1d56 SHA512 e400f8f46f8a78c01d9bf90959351d5e681efde1398970bfc1d906c62c6584255c3bcb678f48d5caba32737988933fe434309f06f1fb9f8d48ba8f579a5d0643
+MISC metadata.xml 610 BLAKE2B 379832b8245fc3f2354260535108e77ab035e5f0a90cc0c48747883295830ca42781db38f074c99b208846b86ee2be34ed166b001725e98a186b0eb21c58aee7 SHA512 c1bbd52895ee9a132f52fbe92a4e74f469f47fd70b78440bda8ffb4ac6c6b0878da144cf9efe551c45480eb242e76ff75a4e2e61a5359d342c214733e48d48f1
diff --git a/app-misc/conmux/conmux-0.15.1-r3.ebuild b/app-misc/conmux/conmux-0.15.1-r3.ebuild
new file mode 100644
index 000000000000..e77e2b81776c
--- /dev/null
+++ b/app-misc/conmux/conmux-0.15.1-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A console multiplexor"
+HOMEPAGE="https://github.com/autotest/autotest"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86"
+IUSE=""
+
+RDEPEND="dev-perl/IO-Multiplex
+ dev-perl/URI"
+DEPEND=""
+
+src_prepare() {
+ # manual installation of drivers and helpers
+ sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
+}
+
+src_install() {
+ perl_set_version
+ emake BASE="${D}/usr" install
+ # helpers and drivers have been removed in src_prepare
+ insinto /usr/share/${PN}/
+ doins -r drivers/ helpers/
+ fperms -R 0750 /usr/share/${PN}/{drivers,helpers}/
+ dodir /etc/${PN}
+ # no need to have the init script in /sbin
+ rm "${D}"/usr/sbin/start || die "failed to remove init script"
+ # console is too generic. Make it conmux-console instead
+ mv "${D}"/usr/bin/console "${D}"/usr/bin/${PN}-console || \
+ die "failed to rename console to conmux-console"
+ # Fix up directory for the module
+ perl_set_version
+ dodir ${VENDOR_LIB}/${PN}
+ mv "${D}"/usr/lib/Conmux.pm "${D}"/${VENDOR_LIB}/. || \
+ die "failed to move the Conmux.pm module"
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newinitd "${FILESDIR}"/${PN}-registry.initd ${PN}-registry
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newconfd "${FILESDIR}"/${PN}-registry.confd ${PN}-registry
+ dodoc README
+}
+
+pkg_postinst() {
+ elog ""
+ elog "If you have more than one serial ports and you want to use all"
+ elog "of them with conmux, copy and paste the 'conmux' init.d and conf.d"
+ elog "files as many times as you want, pointing each conf.d file to the"
+ elog "device's configuration file."
+ elog ""
+ elog "See /etc/conf.d/conmux and"
+ elog "https://github.com/autotest/autotest/wiki/Conmux-OriginalDocumentation"
+ elog "https://github.com/autotest/autotest/wiki/Conmux-Howto"
+ elog "for more information"
+ elog ""
+}
diff --git a/app-misc/conmux/files/conmux-registry.confd b/app-misc/conmux/files/conmux-registry.confd
new file mode 100644
index 000000000000..ac7bd8c20d5e
--- /dev/null
+++ b/app-misc/conmux/files/conmux-registry.confd
@@ -0,0 +1,4 @@
+# Port for Registry listener
+CONMAX_REGISTRY_PORT="63000"
+# Log file
+CONMAX_REGISTRY_LOG="/var/log/conmux-registry.log"
diff --git a/app-misc/conmux/files/conmux-registry.initd b/app-misc/conmux/files/conmux-registry.initd
new file mode 100644
index 000000000000..3e3179a224ab
--- /dev/null
+++ b/app-misc/conmux/files/conmux-registry.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+checkconfig() {
+ # Set sane defaults
+ if [ -z ${CONMUX_REGISTRY_PORT} ]; then
+ CONMUX_REGISTRY_PORT="63000"
+ fi
+ if [ -z ${CONMUX_REGISTRY_LOG} ]; then
+ CONMUX_REGISTRY_LOG="/var/log/conmux-registry.log"
+ fi
+}
+
+start() {
+ checkconfig
+ # Make sure conmux finds everything
+ export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers"
+ ebegin "Starting conmux registry daemon"
+ [ -e ${CONMUX_REGISTRY_LOG} ] && rm ${CONMUX_REGISTRY_LOG}
+ touch ${CONMUX_REGISTRY_LOG}
+ start-stop-daemon -b -m --start -p /run/conmux-registry.pid \
+ --exec /usr/sbin/conmux-registry -- ${CONMUX_REGISTRY_PORT} \
+ ${CONMUX_REGISTRY_LOG}
+}
+
+stop() {
+ ebegin "Stopping conmux registry daemon"
+ start-stop-daemon --stop --pidfile /run/conmux-registry.pid
+ eend $?
+}
diff --git a/app-misc/conmux/files/conmux.confd b/app-misc/conmux/files/conmux.confd
new file mode 100644
index 000000000000..7f983c9ac409
--- /dev/null
+++ b/app-misc/conmux/files/conmux.confd
@@ -0,0 +1,14 @@
+# Configuration file
+# It should point to a valid device configuration file
+# eg CONMUX_CONFIG="/etc/conmux/deviceA.cf
+#
+# See https://github.com/autotest/autotest/wiki/Conmux-Howto
+# and https://github.com/autotest/autotest/wiki/Conmux-OriginalDocumentation
+# for examples
+#
+# Default value is empty so the init script will fail and force you
+# to create a new config
+#
+CONMUX_CONFIG=""
+# Log file
+CONMUX_LOG="/var/log/conmux.log"
diff --git a/app-misc/conmux/files/conmux.initd b/app-misc/conmux/files/conmux.initd
new file mode 100644
index 000000000000..b74fd28b969c
--- /dev/null
+++ b/app-misc/conmux/files/conmux.initd
@@ -0,0 +1,39 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use net
+ need conmux-registry
+}
+
+checkconfig() {
+ if [ ! -f ${CONMUX_CONFIG} ]; then
+ eerror ""
+ eerror "No conmux configuration file was found!"
+ eerror "Please read the conmux README file."
+ eerror ""
+ return 1
+ fi
+ # Sane default
+ if [ -z ${CONMUX_LOG} ]; then
+ CONMUX_LOG="/var/log/conmux.log"
+ fi
+ return 0
+}
+
+start() {
+ checkconfig || exit 1
+ # Make sure conmux finds everything
+ export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers"
+ ebegin "Starting conmux daemon"
+ start-stop-daemon -m -b --start -1 ${CONMUX_LOG} \
+ -2 ${CONMUX_LOG} -p /run/${SVCNAME}.pid \
+ --exec /usr/sbin/conmux -- ${CONMUX_CONFIG}
+}
+
+stop() {
+ ebegin "Stopping conmux daemon"
+ start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid
+ eend $?
+}
diff --git a/app-misc/conmux/metadata.xml b/app-misc/conmux/metadata.xml
new file mode 100644
index 000000000000..41c74b92fdb7
--- /dev/null
+++ b/app-misc/conmux/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <longdescription lang="en">
+CONMUX is a console abstractor. Presenting any console with a
+consistent location, naming and semantic. Access to the console,
+and hardreset of the machine is the same regardless of the underlying
+access methodology.
+</longdescription>
+ <upstream>
+ <remote-id type="github">autotest/autotest</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/countrycodes-1.0.5-r3 b/app-misc/countrycodes-1.0.5-r3
deleted file mode 100644
index ff29dc682ab6..000000000000
--- a/app-misc/countrycodes-1.0.5-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=An ISO 3166 country code finder
-EAPI=6
-HOMEPAGE=http://www.grigna.com/diego/linux/countrycodes/
-KEYWORDS=alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.grigna.com/diego/linux/countrycodes/countrycodes-1.0.5.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=488535db2c004e3c4a90d44589d2e45e
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
new file mode 100644
index 000000000000..8e89dd1deb59
--- /dev/null
+++ b/app-misc/countrycodes/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b677ef454e674e79bcb71ef2a28679f523785ad4eceab767fb976cc4a2388cbecca5e715aa21f6f5a9ae245aa SHA512 a0416ee6b6b7416d9f0f1d379b2b4a86fb0b0ca6df2dd5f0bf3d4e54ba1fa3213da1561a38b1757d2f98b4cf96df1ff74cdea1b7e05587c7250d77353f522832
+DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
+EBUILD countrycodes-1.0.5-r3.ebuild 718 BLAKE2B a898ca882636d63bd98cfb6df0ff7724efbb94d8c05664236d459b3b81750cba6d47ed06b5f6aea3252eb907e0f8b283de033f4ee52b5ebf8b12677bbe22e99c SHA512 4b34f1b15dd64e2fd328d6107117a4008f778ced83978c9262380a63a538cf7b3b1ad5656eb32ab74065fb0b80f6b606df06c34285b839c523ef903d36895a9a
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
new file mode 100644
index 000000000000..1860a7e686ea
--- /dev/null
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="An ISO 3166 country code finder"
+HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/"
+SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+
+S="${WORKDIR}"/${P}/src
+
+PATCHES=( "${FILESDIR}/${PV}-Makefile.patch" )
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_install() {
+ emake \
+ prefix="${D}/usr" \
+ mandir="${D}/usr/share/man/man1" install
+ dosym iso3166 /usr/bin/countrycodes
+ dosym iso3166.1 /usr/share/man/man1/countrycodes
+ dodoc ../doc/{Changelog,README}
+}
diff --git a/app-misc/countrycodes/files/1.0.5-Makefile.patch b/app-misc/countrycodes/files/1.0.5-Makefile.patch
new file mode 100644
index 000000000000..677e59acc5c0
--- /dev/null
+++ b/app-misc/countrycodes/files/1.0.5-Makefile.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 9330578..3ff7319 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,13 +26,13 @@ BINMODE=755
+ LOGDIRMODE=700
+
+ # Compiler to use
+-CC=gcc
++CC ?= gcc
+
+ # Compiler warnings
+-WARNINGS= -pedantic -Wall
++WARNINGS=
+
+ # Compiler flags
+-CCOPTS = -O2 -fomit-frame-pointer
++CCOPTS = ${CFLAGS}
+
+ # The makefile standards document I read says that I have to put it here...
+ SHELL = /bin/sh
+@@ -61,7 +61,7 @@ PROGRAM = iso3166
+ all: $(PROGRAM)
+
+ $(PROGRAM): $(ISO3166OBJ)
+- $(CC) $(CCOPTS) $(ISO3166OBJ) -o $@
++ $(CC) $(CCOPTS) $(LDFLAGS) $(ISO3166OBJ) -o $@
+
+ clean:
+ rm -f $(ISO3166OBJ) core defines.h $(PROGRAM)
+@@ -70,8 +70,10 @@ strip:
+ strip $(PROGRAM)
+
+ install:
+- $(INSTALL) -g root -m $(BINMODE) -o root -s ${srcdir}/$(PROGRAM) ${bindir}
++ mkdir -p ${bindir}
++ $(INSTALL) -g root -m $(BINMODE) -o root ${srcdir}/$(PROGRAM) ${bindir}
+ @echo "Installing man page..."
++ mkdir -p ${mandir}
+ @$(SEDBIN) $(SEDCMDS) ${docdir}/iso3166.1.in > ${mandir}/iso3166.1
+ @chown 0.0 ${mandir}/iso3166.1
+ @echo
diff --git a/app-misc/countrycodes/metadata.xml b/app-misc/countrycodes/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/countrycodes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/cpipe-3.0.3 b/app-misc/cpipe-3.0.3
deleted file mode 100644
index 18bdc3474c8c..000000000000
--- a/app-misc/cpipe-3.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Counting pipe, measures data transfered over pipe
-EAPI=6
-HOMEPAGE=https://github.com/HaraldKi/cpipe
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/HaraldKi/cpipe/archive/3.0.3.tar.gz -> cpipe-3.0.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5169dfaeb06f4c7a8a8fae070a6433bc
diff --git a/app-misc/cpipe/Manifest b/app-misc/cpipe/Manifest
new file mode 100644
index 000000000000..a89821a1902b
--- /dev/null
+++ b/app-misc/cpipe/Manifest
@@ -0,0 +1,3 @@
+DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
+EBUILD cpipe-3.0.3.ebuild 649 BLAKE2B 681dbcee08f62a22faf8e5202815d776870923ff5d5e221f034e2ba3c20bdd5e784375ad31f361c5b76322e8809be240b94c39e7893de68dc7e1cf1b3983de2a SHA512 d5664f0b059e092f0e4ca41e8aaf630cbabab2a07c25616b550069355d6570c35737aca7c4211c37943be15a6b968348eed2c43c8b8e71ddcc7a8e481789bd0b
+MISC metadata.xml 330 BLAKE2B ae60f1e0f28436199a2f72cdb7ec2714258a8ba42eca5bee81c54bf3cfdbcaf04f450c737897242d064c611947124b8865d6b2720eea1eaca4e8643a8fd09e9c SHA512 5d888afdae9cd65ef26799a4c311dd11bbe8cbea93d6e8ba4e92086cce3df5708be39ea4c20a1ea0bd76d9e06846dd1f48af120f0812f4be75e9ae1f43e669bb
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3.ebuild
new file mode 100644
index 000000000000..1f656dc38a49
--- /dev/null
+++ b/app-misc/cpipe/cpipe-3.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Counting pipe, measures data transfered over pipe"
+HOMEPAGE="https://github.com/HaraldKi/cpipe"
+SRC_URI="https://github.com/HaraldKi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s/CFLAGS =/CFLAGS =${CFLAGS} /" \
+ -e "s/-lm/-lm ${LDFLAGS}/" \
+ -e "s/744/644/" makefile || die "sed failed"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+}
diff --git a/app-misc/cpipe/metadata.xml b/app-misc/cpipe/metadata.xml
new file mode 100644
index 000000000000..449e6b0b1299
--- /dev/null
+++ b/app-misc/cpipe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">HaraldKi/cpipe</remote-id>
+ </upstream>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/crunch-3.6 b/app-misc/crunch-3.6
deleted file mode 100644
index ea9659d06dca..000000000000
--- a/app-misc/crunch-3.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A wordlist generator
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/crunch-wordlist/
-KEYWORDS=~amd64 ~arm ~mips ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/crunch-wordlist/crunch-wordlist/crunch-3.6.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b217e796cfeee456db31a4c5ff472292
diff --git a/app-misc/crunch/Manifest b/app-misc/crunch/Manifest
new file mode 100644
index 000000000000..71ccabea75cd
--- /dev/null
+++ b/app-misc/crunch/Manifest
@@ -0,0 +1,3 @@
+DIST crunch-3.6.tgz 38635 BLAKE2B 987fc0fddbc9330c2f196b5914c535e3c81a0cbd30bd2121d05ccb937c9ba9f3f9296dd20a638efad8219cc5555203dc8b75b2fa6aa3e497a3da665b4c51fbeb SHA512 85a2a12bb481988ab27a19602122abc29bb307de0af279132dcc0565dfc4ba44ab9f7ca15d876001f2e6dcf7be77ed50168cb066fc6a65bf06ec5cf9d798e81f
+EBUILD crunch-3.6.ebuild 545 BLAKE2B d11fd859562d85cd4b6171ca4f82bc4a2d04bdac490f6f717c1cac5a5c7c15e8d53ed6b64f6c4f1d1b518b5bca5b062af7183d25f81b943a9a1a84bd23fd0638 SHA512 c83c126094ee74ac88229b3abcef02a81f722eee51605e0e9be8233faffb11a4c3a9c3aa5219b7d915de01f31fca160d6c285f6e847fa4af34f7d3ca2722d01f
+MISC metadata.xml 332 BLAKE2B 1bd91ecbe54c77bdf8880d306081fea018c7508f12d5b508b915150978e907e831ce9dda40f199472a6360067b69d15d2f022a223c69a9c7d2ac649e57ef44ea SHA512 b537452a244bd1d52508d75606efc72d276f6cc502e3bf1840758cb73d9fa907aed0d97545504a67bc49ff72e700c6a487e4d874560698db4850af66b4184b68
diff --git a/app-misc/crunch/crunch-3.6.ebuild b/app-misc/crunch/crunch-3.6.ebuild
new file mode 100644
index 000000000000..7488fad701ea
--- /dev/null
+++ b/app-misc/crunch/crunch-3.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A wordlist generator"
+HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
+SRC_URI="mirror://sourceforge/crunch-wordlist/crunch-wordlist/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+
+src_prepare() {
+ epatch_user
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install(){
+ dobin crunch
+ doman crunch.1
+ insinto /usr/share/crunch
+ doins charset.lst
+}
diff --git a/app-misc/crunch/metadata.xml b/app-misc/crunch/metadata.xml
new file mode 100644
index 000000000000..da39990215bb
--- /dev/null
+++ b/app-misc/crunch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">crunch-wordlist</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/cstream-3.1.1 b/app-misc/cstream-3.1.1
deleted file mode 100644
index 37f635d14203..000000000000
--- a/app-misc/cstream-3.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=general-purpose stream-handling tool like UNIX dd
-EAPI=5
-HOMEPAGE=http://www.cons.org/cracauer/cstream.html
-KEYWORDS=amd64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://www.cons.org/cracauer/download/cstream-3.1.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10aaf911293348cdcbabe0a04477a451
diff --git a/app-misc/cstream/Manifest b/app-misc/cstream/Manifest
new file mode 100644
index 000000000000..044fb50c8c61
--- /dev/null
+++ b/app-misc/cstream/Manifest
@@ -0,0 +1,3 @@
+DIST cstream-3.1.1.tar.gz 96609 BLAKE2B 360183c215e4aaf536d6455393b8e5a27fcfb15dc581205e53c0a160c97d028165cd9c24feea13f9a4ed11de1710ffbd1d548cadaa7fdef912eb1ee932a49ee6 SHA512 8d6364da622711f6888fd221b2f36f5da23d2a562d5a797d58d7ef361415481de8ab9ae55ae856d47c2d0141d570e22a61ab0ce9954c043877196df168f2f43a
+EBUILD cstream-3.1.1.ebuild 589 BLAKE2B 31d37e60f992ea54f3a47968d1c05e4d62f5294ddc5d539f91b14bd985a72b9d518b7dfafdef156a5cbfb1ec4ffde26bd0a985c92754fa826340b52723b9c10c SHA512 861a2f99e48c7bf55d9c45c3a691e56bfbf26c0994004a57cfa799c5ae4d0cc98d3783c6477556b5a913c186a6a128bcca2c6eae80a6d6cb125bb1dd165244d9
+MISC metadata.xml 1733 BLAKE2B e33cd8b44e4d1dc0f37c60d95d1bda270d3ce7533dc2e031bb23b6a73c1a362091ab780d0a541eaac1572fa2987a30026877f91e48189818218ab8ac75285c1e SHA512 c3609fb6e7fa87dcdd924cdad07d5d9121ace333ca87fac64ae701d97f74a09d4f6788cf82793f8ce579f54b6872fe379d9f758da170ae80d770c1306106b882
diff --git a/app-misc/cstream/cstream-3.1.1.ebuild b/app-misc/cstream/cstream-3.1.1.ebuild
new file mode 100644
index 000000000000..17353ea486d6
--- /dev/null
+++ b/app-misc/cstream/cstream-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AT_M4DIR="auxdir"
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="general-purpose stream-handling tool like UNIX dd"
+HOMEPAGE="http://www.cons.org/cracauer/cstream.html"
+SRC_URI="http://www.cons.org/cracauer/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_prepare() {
+ # this file does not regenerated automatically by autotools-utils eclass
+ rm auxdir/missing || die 'failed to remove auxdir/missing'
+
+ autotools-utils_src_prepare
+}
diff --git a/app-misc/cstream/metadata.xml b/app-misc/cstream/metadata.xml
new file mode 100644
index 000000000000..ecf62c4184c9
--- /dev/null
+++ b/app-misc/cstream/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription lang="en">
+cstream is a general-purpose stream-handling tool like UNIX dd, usually used in commandline-constructed pipes.
+Features:
+ - Sane commandline switch syntax.
+ - Exact throughput limiting, on the incoming side. Timing variance in previous reads are counterbalanced in the following reads.
+ - Precise throughput reporting. Either at the end of the transmission or everytime SIGUSR1 is received. Quite useful to ask lengthy operations how much data has been transferred yet, i.e. when writing tapes. Reports are done in bytes/sec and if appropriate in KB/sec or MB/sec, where 1K = 1024.
+ - SIGHUP causes a clean shutdown before EOF on input, timing information is displayed.
+ - Build-in support to write its PID to a file, for painless sending of these signals.
+ - Build-in support for fifos. Example usage is a 'pseudo-device', something that sinks or delivers data at an appropriate rate, but looks like a file, i.e. if you test soundcard software. See the manpage for examples.
+ - Built-in data creation and sink, no more redirection of /dev/null and /dev/zero. These special devices speed varies greatly among operating systems, redirecting from it isn't appropriate benchmarking and a waste of resources anyway.
+ - Accepts 'k', 'm' and 'g' character after number for "kilo, mega, giga" bytes for overall data size limit.
+ - "gcc -Wall" clean source code, serious effort taken to avoid undefined behavior in ANSI C or POSIX, except long long is required. Limiting and reporting works on data amounts &gt; 4 GB.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/cw-1.0.16-r3 b/app-misc/cw-1.0.16-r3
deleted file mode 100644
index 878d0b8259fb..000000000000
--- a/app-misc/cw-1.0.16-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A non-intrusive real-time ANSI color wrapper for common unix-based commands
-EAPI=5
-HOMEPAGE=http://cwrapper.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/cwrapper/cw-1.0.16.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6531f6fd5b3078c20c1a4b09e70bbbb
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
new file mode 100644
index 000000000000..acf3d0b3bb6f
--- /dev/null
+++ b/app-misc/cw/Manifest
@@ -0,0 +1,7 @@
+AUX 1.0.16-collision.patch 1367 BLAKE2B b36dc61f1a898c08e13e527adf219b47a15cad8a9f9f11a9e80adb289cff592349f16189f4e8f776bcf462f6488ef4be24b77fb70bf0f8f2cdff6517786ae16c SHA512 2f5e2dc0eb6af383207cd514a5e42bd1cd03f8748a8c1c66d0d83b7a5abd2fafc108a2207ff96bef5b74b9044c21fbe185e3b47a090d11387c7d1bb8f7684e76
+AUX 1.0.16-format-security.patch 412 BLAKE2B 07465169761141e6bfd415ac78366df1a27e8bb38d3ffe2091653235cf790f72b25e80b6ab744eeebd16b4ac57acfad20089d052ee76c728212d0a60ffcc6287 SHA512 604a22a47e36933d4b2788c1acfe1930e2935dac14dbad5a717ce69b26463bdffcc54aa74bf5dfc22631b3a587ca56bda359d86cebf9fa1ad7c7a235fb71a5db
+AUX 1.0.16-ldflags.patch 486 BLAKE2B 350b72daa7c419ff4b8de846d33921450d55d94d26714438f93d197bb620e9d1a6d70c681f4547b3b72fe7c3ee31fb0700d3bd1f8ee8e2dc8820c63b7be4c461 SHA512 75883411ef18c739e6f86ba53a5b515e8081ac10d1b3e894de9bee4dd0040620f0fe09786085acd325669475d0d1e99b4d46554a68ebffcad18e50cb281cabfe
+AUX 1.0.16-path.patch 550 BLAKE2B d14ac37b4dc3a951da4f472598e1a3a8863d9c61cb3994a3da97c31aed9b31f1aa1e1aa1a39f764be79aaeb4e53655983eddff5bcccb876605ed662b50bf04fe SHA512 2d8c1cf55e0d2d725aae4c3bd4f8300402b036e934218135ac840f9f891424458a79a9c2432bd4fa47255c30f096c3752a1a5897854f82da438398d5c671af23
+DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
+EBUILD cw-1.0.16-r3.ebuild 1552 BLAKE2B 879d4516147ee9632c02bef1b8e00191eec2014cecd94b66b9c3a2dd3a75ac8745d300c40c87e14e3db87174ccc36732177f386b51c860b0442980a8de6ae0c7 SHA512 d298a475374013aad061c6555c14ec9b819ca34f24f2eb511951ea5ac4baf14a248e8235bcf5ee7904244f8fa6ef5b5211da16aaca0a305d8644ea51f0a87378
+MISC metadata.xml 343 BLAKE2B 809bbff73b5e90cb0c958b05b619ff6e6e00a72fb6c174a7d010e29a4f28a4c7a6d26cf2aca92b8b3cfc3604d6dca7fc592f857618a1b2e6c6cf038c30b55e66 SHA512 d0aa39ed1e7fe08244130357fe59579405e1f2d08675bf3979fc1d3944033da32f58926a5857e3a526417709af1351fb443f91657ce4e7b3da0aa8405a60b3a1
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
new file mode 100644
index 000000000000..5a667b143f95
--- /dev/null
+++ b/app-misc/cw/cw-1.0.16-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
+HOMEPAGE="http://cwrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PV}-ldflags.patch \
+ "${FILESDIR}"/${PV}-path.patch \
+ "${FILESDIR}"/${PV}-collision.patch \
+ "${FILESDIR}"/${PV}-format-security.patch
+ tc-export CC
+}
+
+src_compile() {
+ emake local
+}
+
+src_install() {
+ insinto /usr/share/cw
+ doins etc/*
+
+ exeinto /usr/libexec/cw
+ doexe def/*
+
+ doman man/cwu*
+ newman man/cw.* color-wrapper
+ dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README*
+
+ dobin bin/{cwu,colorcfg}
+ # app-misc/color currently conflicts; hopefully 'colors' is safe
+ newbin bin/color colors
+ # media-radio/unixcw currently conflicts;
+ newbin bin/cw color-wrapper
+}
+
+pkg_postinst() {
+ ebegin "Updating definition files"
+ cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null
+ eend $?
+
+ elog "To enable color-wrapper, as your user, run:"
+ elog " colorcfg [1|2|3]"
+ elog "to add relevant environment variables to your ~/.bash_profile"
+ elog "Run colorcfg without options to see what [1|2|3] means."
+ elog
+ elog "After sourcing your ~/.bash_profile, commands for which definitions"
+ elog "are provided should have colored output."
+ elog
+ elog "To enable/disable colored output, run: 'colors [on|off]'."
+}
diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch
new file mode 100644
index 000000000000..52bb8cab8f3b
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-collision.patch
@@ -0,0 +1,34 @@
+diff --git a/src/cw.c b/src/cw.c
+index d7b4875..a7811d8 100644
+--- a/src/cw.c
++++ b/src/cw.c
+@@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
+ s=strlen(buf);
+ if(buf[s]=='\n')s--;
+ if(buf[s]=='\r')s--;
+- if(s>4&&!strncmp(buf,"#!",2)&&!strncmp(buf+(s-4),"/cw",3))return(1);
++ if(s>15&&!strncmp(buf,"#!",2)&&!strncmp(buf+(s-15),"/color-wrapper",14))return(1);
+ return(0);
+ }
+ /* sets left and right borders. */
+diff --git a/src/cwu.c b/src/cwu.c
+index 823618d..63f566b 100644
+--- a/src/cwu.c
++++ b/src/cwu.c
+@@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
+ if(argc>1&&!strcmp(argv[1],"-v"))
+ cwuexit(1,"cwu (color wrapper directive updater) v"VERSION);
+ if(argc<2)
+- cwuexit(1,"syntax: cwu <definitions directory> <cw binary path>");
++ cwuexit(1,"syntax: cwu <definitions directory> <color-wrapper binary path>");
+ if(argc<3)cwuexit(1,"no path provided to update with.");
+- if(strncmp(argv[2]+(strlen(argv[2])-3),"/cw",3))
+- cwuexit(1,"cw binary path doesn't end with `/cw'.");
++ if(strncmp(argv[2]+(strlen(argv[2])-14),"/color-wrapper",14))
++ cwuexit(1,"cw binary path doesn't end with `/color-wrapper'.");
+ if(access(argv[2],X_OK))
+- cwuexit(1,"cw binary does not exist or is not executable.");
++ cwuexit(1,"color-wrapper binary does not exist or is not executable.");
+ globcw(argv[1],argv[2]);
+ cwuexit(0,0);
+ exit(0);
diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch
new file mode 100644
index 000000000000..20f0b1d06b1e
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@@ -0,0 +1,16 @@
+ src/cw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cw.c b/src/cw.c
+index d7b4875..3ec1ac1 100644
+--- a/src/cw.c
++++ b/src/cw.c
+@@ -643,7 +643,7 @@ void sighandler(signed int sig){
+ else if(sig==SIGUSR1)ext=1;
+ else if(sig==SIGALRM)ext=2;
+ else if(sig==SIGPIPE||sig==SIGINT){
+- fprintf(stderr,pal2[16]);
++ fprintf(stderr,"%s", pal2[16]);
+ fflush(stderr);
+ cwexit(0,0);
+ }
diff --git a/app-misc/cw/files/1.0.16-ldflags.patch b/app-misc/cw/files/1.0.16-ldflags.patch
new file mode 100644
index 000000000000..46037312c6c3
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-ldflags.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.in b/Makefile.in
+index 9a6e4ec..e510493 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -19,11 +19,11 @@ all:
+
+ cw:
+ @$(ECHO) "* Compiling cw(color wrapper)..."
+- @$(CC) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@
++ $(CC) $(CFLAGS) $(LDFLAGS) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@
+
+ cwu:
+ @$(ECHO) "* Compiling cwu(color wrapper directive updater)..."
+- @$(CC) src/cwu.c -o bin/cwu @CFLAGS@
++ $(CC) $(CFLAGS) $(LDFLAGS) src/cwu.c -o bin/cwu
+
+ local: cw cwu
+
diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch
new file mode 100644
index 000000000000..f62b5bd994d4
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-path.patch
@@ -0,0 +1,19 @@
+diff --git a/bin/colorcfg b/bin/colorcfg
+index cf73b50..3e78c73 100755
+--- a/bin/colorcfg
++++ b/bin/colorcfg
+@@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"
+ if test -x "${HOME}/.cw/bin/colorcfg";then
+ CWLIB="${HOME}/.cw/def"
+ else
+- SED="`which sed 2>/dev/null`"
+- if test -z "$SED";then
+- CWLIB="/usr/local/lib/cw"
+- echo "(NOTE: using static cw library path, this could be invalid)"
+- else
+- CWLIB="`echo \"$0/lib/cw\"|sed \"s/\/bin\/colorcfg//g\"`"
+- fi
++ CWLIB="/usr/libexec/cw"
+ fi
+
+ echo "[ cw library path: $CWLIB ]"
diff --git a/app-misc/cw/metadata.xml b/app-misc/cw/metadata.xml
new file mode 100644
index 000000000000..e5ef85998d9b
--- /dev/null
+++ b/app-misc/cw/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">cwrapper</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/dailystrips-1.0.28-r3 b/app-misc/dailystrips-1.0.28-r3
deleted file mode 100644
index 9dd04a9285a4..000000000000
--- a/app-misc/dailystrips-1.0.28-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=dailystrips automatically downloads your favorite online comics from the web
-EAPI=6
-HOMEPAGE=http://dailystrips.sourceforge.net/
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-perl/libwww-perl-5.50 dev-perl/DateTime dev-perl/TimeDate
-SLOT=0
-SRC_URI=mirror://sourceforge/dailystrips/dailystrips-1.0.28.tar.gz
-_md5_=d58ea12cc780c4bffad20c86864ca48b
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
new file mode 100644
index 000000000000..0ec5ae069096
--- /dev/null
+++ b/app-misc/dailystrips/Manifest
@@ -0,0 +1,3 @@
+DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
+EBUILD dailystrips-1.0.28-r3.ebuild 748 BLAKE2B d47b21c95c6d56b19eb2890dc37fdd40528edc3bbc227b588ac84f4ba6d25e8046e577b3d72b82cac3814b8f109554f82e4f7ccb6f9f3b53fef2994084b9cba6 SHA512 955a0f2476b845f087fcab960d96ee9c042213d1600399281dce5d552104d277a287bc264216a449d3dd3f18b8bdf2dca5835f76917344372323647f9a8733fd
+MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
new file mode 100644
index 000000000000..55c6f5085372
--- /dev/null
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="dailystrips automatically downloads your favorite online comics from the web"
+HOMEPAGE="http://dailystrips.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/libwww-perl-5.50
+ dev-perl/DateTime
+ dev-perl/TimeDate"
+
+src_prepare() {
+ sed -i -e "s:/usr/share/dailystrips/strips.def:/etc/strips.def:" \
+ dailystrips || die "sed dailystrips failed"
+ default
+}
+
+src_install() {
+ dobin dailystrips dailystrips-clean dailystrips-update
+ dodoc BUGS CHANGELOG CONTRIBUTORS README* TODO
+ insinto /etc
+ doins strips.def
+}
diff --git a/app-misc/dailystrips/metadata.xml b/app-misc/dailystrips/metadata.xml
new file mode 100644
index 000000000000..5f283232f3b3
--- /dev/null
+++ b/app-misc/dailystrips/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">dailystrips</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/datefudge-1.17 b/app-misc/datefudge-1.17
deleted file mode 100644
index de983d307d44..000000000000
--- a/app-misc/datefudge-1.17
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A program (and preload library) to fake system date
-EAPI=4
-HOMEPAGE=https://packages.qa.debian.org/d/datefudge.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/datefudge/datefudge_1.17.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=032dddb5bfaae5f1d8fa16b0086c9661
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
new file mode 100644
index 000000000000..7e6d06778afe
--- /dev/null
+++ b/app-misc/datefudge/Manifest
@@ -0,0 +1,4 @@
+AUX datefudge-1.17-bsd.patch 2751 BLAKE2B d6d5bd6048126bb4f95dfba76eb538b555829c16272e846f3c470ee882ab9313b5d5974d29b6e73835278c61c032ba3d6acaf2026e9d3e91c5cac825bc4006c6 SHA512 390ff54428a4ffbdf5cc383aa6229f3ed7be7070d62567a0a04bf169efb6e7fe21c756d34d7865f51523a26204e6014edf936800523723d5f8370997f06dd858
+DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
+EBUILD datefudge-1.17.ebuild 972 BLAKE2B de096b081d3d0f8050ae187b7206caed8385c4f024b6254cf7953cef65de367effac0b933d0514446058bd59cbae873cdba4e2c0d46974f3d469dc8719a24a74 SHA512 5490d0eeed9d1c2ac6a1f2aff174f8b5411876983bbcf1e8194f8d882617563d3a2ffac14e5e0b4d4a72727ea0b85b08c5461a90366626f264667fb049e67b86
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild
new file mode 100644
index 000000000000..d26c1c7f125a
--- /dev/null
+++ b/app-misc/datefudge/datefudge-1.17.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="A program (and preload library) to fake system date"
+HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+ use userland_BSD && epatch "${FILESDIR}"/${P}-bsd.patch
+ sed -i \
+ -e '/dpkg-parsechangelog/d' \
+ -e "s:usr/lib:usr/$(get_libdir):" \
+ Makefile || die
+
+ if use prefix; then
+ sed -i -e '/-o root -g root/d' Makefile || die
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" VERSION="${PV}"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" VERSION="${PV}" install
+ dodoc debian/changelog README
+}
diff --git a/app-misc/datefudge/files/datefudge-1.17-bsd.patch b/app-misc/datefudge/files/datefudge-1.17-bsd.patch
new file mode 100644
index 000000000000..2f2a7dac9be3
--- /dev/null
+++ b/app-misc/datefudge/files/datefudge-1.17-bsd.patch
@@ -0,0 +1,58 @@
+diff --git a/Makefile b/Makefile
+index b2f81bb..35da75e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,17 +12,17 @@ compile all: datefudge datefudge.so
+
+ install: datefudge datefudge.so datefudge.1
+ install -d $(DESTDIR)/usr/lib/datefudge/
+- $(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
++ $(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
+ install -d $(DESTDIR)/usr/bin/
+- $(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)/usr/bin
++ $(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)/usr/bin
+ install -d $(DESTDIR)/usr/share/man/man1
+- install -o root -g root -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
++ install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
+
+ datefudge: datefudge.sh
+ sed -e 's,@VERSION@,$(VERSION),g' < $< > $@
+
+ datefudge.so: datefudge.o
+- $(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
++ $(CC) $(LDFLAGS) -o $@ -shared $< -lc
+
+ datefudge.o: datefudge.c
+ $(CC) $(CFLAGS) -c -o $@ $<
+@@ -39,8 +39,8 @@ test: compile
+ export TZ=UTC ;\
+ ret1=1; ret2=1 ;\
+ for i in 1 2; do \
+- export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00' +%s` ;\
+- dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\
++ export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s` ;\
++ dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\
+ exp="1970-01-02.12:15:00" ;\
+ [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; } ;\
+ echo "failed: expected: $$exp, actual: $$dt" ;\
+@@ -49,7 +49,7 @@ test: compile
+ echo -n "Running a simple perl localtime() test... " ;\
+ pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\
+ for i in 1 2; do \
+- export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00' +%s` ;\
++ export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s` ;\
+ dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"` ;\
+ exp="1970-01-02" ;\
+ [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; } ;\
+diff --git a/datefudge.c b/datefudge.c
+index 8c86652..fc7e3d6 100644
+--- a/datefudge.c
++++ b/datefudge.c
+@@ -14,7 +14,6 @@
+ #include <stdlib.h>
+ #include <dlfcn.h>
+ #include <assert.h>
+-#include <features.h>
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/time.h>
diff --git a/app-misc/datefudge/metadata.xml b/app-misc/datefudge/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-misc/datefudge/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/app-misc/dateutils-0.4.1 b/app-misc/dateutils-0.4.1
deleted file mode 100644
index 9a6398fa21ce..000000000000
--- a/app-misc/dateutils-0.4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure test
-DEPEND=app-arch/xz-utils sys-libs/timezone-data
-DESCRIPTION=command line date and time utilities
-EAPI=6
-HOMEPAGE=https://hroptatyr.github.com/dateutils/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!sys-fabric/dapl
-SLOT=0
-SRC_URI=https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.1.tar.xz
-_md5_=8af478e072b493f3b372c83dbb13d974
diff --git a/app-misc/dateutils-0.4.2 b/app-misc/dateutils-0.4.2
deleted file mode 100644
index 9d41bd08e7a9..000000000000
--- a/app-misc/dateutils-0.4.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure test
-DEPEND=app-arch/xz-utils sys-libs/timezone-data
-DESCRIPTION=command line date and time utilities
-EAPI=6
-HOMEPAGE=https://hroptatyr.github.com/dateutils/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!sys-fabric/dapl
-SLOT=0
-SRC_URI=https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.2.tar.xz
-_md5_=86d9813aef3055290c467eed98071676
diff --git a/app-misc/dateutils-0.4.3 b/app-misc/dateutils-0.4.3
deleted file mode 100644
index 6d6825da57f9..000000000000
--- a/app-misc/dateutils-0.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure test
-DEPEND=app-arch/xz-utils sys-libs/timezone-data
-DESCRIPTION=command line date and time utilities
-EAPI=6
-HOMEPAGE=https://hroptatyr.github.com/dateutils/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!sys-fabric/dapl
-SLOT=0
-SRC_URI=https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.3.tar.xz
-_md5_=e987b25b7c88065facd6779425938829
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
new file mode 100644
index 000000000000..d45e2465c849
--- /dev/null
+++ b/app-misc/dateutils/Manifest
@@ -0,0 +1,7 @@
+DIST dateutils-0.4.1.tar.xz 611460 BLAKE2B f6dc70388e1cd269e5b666dfb23d8eace3dd98408538e102e220344e71670084fb6591dd213d625b33a57adde929f7ee5aa064950742b38c29fa4bec1cd3b9f3 SHA512 c13461de6dad483b0014692a2319a7bf9ed1677415b8ee168131b397086f75725eb8b4e833d8b4a22f4aa726d6aca74be2597c2e07ef75a036cfea9bf67ccf1b
+DIST dateutils-0.4.2.tar.xz 620196 BLAKE2B b2aa265db45c92e68ed2fa51d824eb2c5bef2cf1d663fcb1033cde4e8a818ac8c024554dd42c030aa0e3bbba1c07717c3040b9573291edb3bc740e92113f9406 SHA512 0b6e98bd9402dc3629122c3d68ab54df547ce779806661cc01df3625ab7cedb429d943ef46e151653283c1ac6c557f4bf14b3b5adaafbcac1d0a86c6d12895fd
+DIST dateutils-0.4.3.tar.xz 631216 BLAKE2B 1c9184e589eb01ff1da8be941afa5abb8095ef4b61a22d14e5c06f4faad175e2e9d8cf7077655f170033a125b7594d554e6996bbd0dd6f6508c16076d069e285 SHA512 0210ad1f47aec77b8b87a520da9155430b52068e53733ef7bb26dfa10e8651f2190171537d4317adf888733e9377f961d5ed070efacd8ca18139225fa8c185ca
+EBUILD dateutils-0.4.1.ebuild 613 BLAKE2B 75543251329b62a4a2f021e47783080810df7f9ca7f1eb69afdbd94e750d209e3c073d608ec2064e83a03e0640c308af041c654ef029e5465931761d99a7309a SHA512 d1b489a9ae82c30cf2f5160d86dffee4e1b180361d50e440f2f59d392d82056e65fe9d1c04906c65836de1293a026bee5c1cc8674454d92d7ba00e609b3e361a
+EBUILD dateutils-0.4.2.ebuild 609 BLAKE2B 630d6f77d66e11c654f494a9b97bbeefd1f249810c005a75242935da52199bd60d8e5d2f617093ade7b25878487b251b21caa84e247a510730be3efc0f8e4a46 SHA512 a6d34dcf92bd0de32e8fd6debdcd8ebd6bfb368ffdf9f0285e1be385ce154e774b31c2ff72fdb22492fb567d13aab2d286b220be250752395b72cf8a57d112ea
+EBUILD dateutils-0.4.3.ebuild 609 BLAKE2B 215b9b8c08e6b83a62e3b0761aee06ee756c256dddd088ad7f0d5b2888f45b1b0608a00e7bee47d03b124a8d437b73d5e66f509ddeb0b8b582262f651f7ac294 SHA512 55cadfe615fc99640bdc59d80ef8639ffb514d5069663cc04f0917a52059bfbe99fffc1785481b870e5ce5011b8f6aeba50a6dd135dced3942545f4a7b980b26
+MISC metadata.xml 333 BLAKE2B e586b40344d636a0bd265fdd2482726c1a17f6311fa7cf1ceadc8022ec3acebcda968c189bb41fc5ac9249251e8c0048dd2e8b33be47e4676465475df7018e07 SHA512 a1308350546b711fdddab0b90f257fcffa15f74855d9a08172b0a38d4d859b748150e17270b1534dc97d949143be5f39d8822dfcfc030b2a60f601c3551b9172
diff --git a/app-misc/dateutils/dateutils-0.4.1.ebuild b/app-misc/dateutils/dateutils-0.4.1.ebuild
new file mode 100644
index 000000000000..f9a24de86d03
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://hroptatyr.github.com/dateutils/"
+SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils
+ sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="!sys-fabric/dapl"
+
+src_configure() {
+ econf \
+ --docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+ # parallel tests failure
+ emake CFLAGS="${CFLAGS}" -j1 check
+}
diff --git a/app-misc/dateutils/dateutils-0.4.2.ebuild b/app-misc/dateutils/dateutils-0.4.2.ebuild
new file mode 100644
index 000000000000..63d7c2a12439
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://hroptatyr.github.com/dateutils/"
+SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils
+ sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="!sys-fabric/dapl"
+
+src_configure() {
+ econf --docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+ # parallel tests failure
+ emake CFLAGS="${CFLAGS}" -j1 check
+}
diff --git a/app-misc/dateutils/dateutils-0.4.3.ebuild b/app-misc/dateutils/dateutils-0.4.3.ebuild
new file mode 100644
index 000000000000..b894eb0de283
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://hroptatyr.github.com/dateutils/"
+SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils
+ sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="!sys-fabric/dapl"
+
+src_configure() {
+ econf --docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+ # parallel tests failure
+ emake CFLAGS="${CFLAGS}" -j1 check
+}
diff --git a/app-misc/dateutils/metadata.xml b/app-misc/dateutils/metadata.xml
new file mode 100644
index 000000000000..62a5cc9281a0
--- /dev/null
+++ b/app-misc/dateutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/datovka-3.0.3-r1 b/app-misc/datovka-3.0.3-r1
deleted file mode 100644
index 7ad56fe33744..000000000000
--- a/app-misc/datovka-3.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/dejavu >=net-libs/dslib-3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=GUI to access Czech eGov "Datove schranky"
-EAPI=5
-HOMEPAGE=https://labs.nic.cz/page/969/datovka/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/dejavu >=net-libs/dslib-3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.nic.cz/public_media/datove_schranky/releases/src/datovka-3.0.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f633bb35b99ceeebaebfcbac05e8ff4
diff --git a/app-misc/datovka-4.10.2 b/app-misc/datovka-4.10.2
deleted file mode 100644
index 19e8758807cb..000000000000
--- a/app-misc/datovka-4.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.7 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
-DESCRIPTION=GUI to access the Czech eGov system of Datove schranky
-EAPI=6
-HOMEPAGE=https://www.datovka.cz/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.7
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/datove_schranky/4.10.2/datovka-4.10.2.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e667ca60aa8d1f0e86c950db7d08017
diff --git a/app-misc/datovka-4.9.2 b/app-misc/datovka-4.9.2
deleted file mode 100644
index 0728f1ec9b98..000000000000
--- a/app-misc/datovka-4.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.7 >=dev-qt/linguist-tools-5.3.2:5
-DESCRIPTION=GUI to access the Czech eGov system of Datove schranky
-EAPI=6
-HOMEPAGE=https://labs.nic.cz/cs/datovka.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.7
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/datove_schranky/4.9.2/datovka-4.9.2.tar.xz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=472d24b95891a561566c797120b5d792
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
new file mode 100644
index 000000000000..14121b6d5a58
--- /dev/null
+++ b/app-misc/datovka/Manifest
@@ -0,0 +1,7 @@
+DIST datovka-3.0.3.tar.gz 671555 BLAKE2B e8fd9a196ed2d3c353dd94c4be4d734666f5a90866de7ddf0a8efd3ff9b6e96343719810cf585b8f4321c5028b9f229a0224cbc9ee4cb1ddb18727012bfa4d5d SHA512 c3dfa23125849fb1c5691a4ad6077fedd307b8c0417c72e014876f56c1185a2da73478927fb594cac45ada77a71a3798f57a75032a4d83cd81c194fe3257397d
+DIST datovka-4.10.2.tar.xz 2465696 BLAKE2B 1c355070c4bce005f1a601875edbf40c279e11f32653e59d52321f284b93abd6e404774f41d3bc0430b9b01a13bd1667223e8aafd60f89058ba4eee2ebeb8269 SHA512 e1338d9448b042b26b9829341b93cd8d07fd7d2b854dce33b80731c9a9d41965ea646ac95c7883615ac4f682ed28fb1d3184554505acfb5e76b4ef03ab32bc98
+DIST datovka-4.9.2.tar.xz 2373540 BLAKE2B 2de754a5a9b59b5184f63dd8e1790b3345cc6fc2429aeafc60d6944a8f7372b898e11bfab7aaf21b9041697532b454cd7d91a968435a0cb297183902881b705b SHA512 a906a032d138be33f6011c9e5869c5c8ae44f305279fc531e6e21e7911a04d3f3f2a360d561f0553c581806fe3ac8344dbb30bcdc604e79db37fc948f12a7e1a
+EBUILD datovka-3.0.3-r1.ebuild 664 BLAKE2B 5dfcc4bfa7843f007dc01985d9e18cefa9176774b11680b58cc1ea5fa774971f7084d439ba18afc57abd5f0290ac1c28277bb4118800a3601763c20773c0862d SHA512 9531c13e5ecc9d26fbee745f7399132b18adf3c595dcf91ac0cb5ea55252614ba53e54b55f54f6fefd3e34d286dc08b95dc67a27d551c3e01b2e6a472c398b0c
+EBUILD datovka-4.10.2.ebuild 1083 BLAKE2B e3537122d6e380ace728d89aa18f255ec391f13bfcb239db588e1a8ed7153e64bf5019b84606a9f372e28b7eb0d4274fd79cfedbe1a573982666a3f569f06a79 SHA512 dc5192ec3a6434396365da91d638b677d03b15d2c63d64f1874bda635445917e9097c3aa8c72a10f3d9256d3902e70bf0d6f7d465cb87325edc20bcb0c57ce05
+EBUILD datovka-4.9.2.ebuild 989 BLAKE2B 928649d617d216fcfbb4d3960b30625de0a2b7211350681903d660cc6ca67be1f9d1cc237b4eeb084c26f82efc7019a6dcda9435156de72981d045f16da76413 SHA512 48753345ccb14d1328ba38211f7577b370e1c9835bb5d51bbfde8a60df02eba182eb4166fcb2deff1f6f0161e3724187910bdba59a56f55c0ca62d8698be7275
+MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-3.0.3-r1.ebuild b/app-misc/datovka/datovka-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..24c42c3aa1e3
--- /dev/null
+++ b/app-misc/datovka/datovka-3.0.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GUI to access Czech eGov \"Datove schranky\""
+HOMEPAGE="https://labs.nic.cz/page/969/datovka/"
+SRC_URI="https://www.nic.cz/public_media/datove_schranky/releases/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/reportlab[${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+ media-fonts/dejavu
+ >=net-libs/dslib-3.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/app-misc/datovka/datovka-4.10.2.ebuild b/app-misc/datovka/datovka-4.10.2.ebuild
new file mode 100644
index 000000000000..1cfe026721f1
--- /dev/null
+++ b/app-misc/datovka/datovka-4.10.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+HOMEPAGE="https://www.datovka.cz/"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2
+ >=dev-qt/qtcore-${QT_PV}
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qtnetwork-${QT_PV}
+ >=dev-qt/qtprintsupport-${QT_PV}
+ >=dev-qt/qtsql-${QT_PV}[sqlite]
+ >=dev-qt/qtsvg-${QT_PV}
+ >=dev-qt/qtwidgets-${QT_PV}
+ >=net-libs/libisds-0.10.7
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-qt/linguist-tools-${QT_PV}
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+ lrelease datovka.pro || die
+ eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+ einstalldocs
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/datovka/datovka-4.9.2.ebuild b/app-misc/datovka/datovka-4.9.2.ebuild
new file mode 100644
index 000000000000..249b0b29141e
--- /dev/null
+++ b/app-misc/datovka/datovka-4.9.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+HOMEPAGE="https://labs.nic.cz/cs/datovka.html"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2
+ >=dev-qt/qtcore-${QT_PV}
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qtnetwork-${QT_PV}
+ >=dev-qt/qtprintsupport-${QT_PV}
+ >=dev-qt/qtsql-${QT_PV}[sqlite]
+ >=dev-qt/qtsvg-${QT_PV}
+ >=dev-qt/qtwidgets-${QT_PV}
+ >=net-libs/libisds-0.10.7
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-qt/linguist-tools-${QT_PV}
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+ lrelease datovka.pro
+ eqmake5 PREFIX="/usr" DISABLE_VERSION_CHECK_BY_DEFAULT=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+ einstalldocs
+}
diff --git a/app-misc/datovka/metadata.xml b/app-misc/datovka/metadata.xml
new file mode 100644
index 000000000000..1756f1e83a7c
--- /dev/null
+++ b/app-misc/datovka/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>amynka@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ A GUI for accessing ISDS (InformaÄní systém datových schránek
+ / Data Box Information System) SOAP services as defined in Czech ISDS Act
+ (300/2008 Coll.) and implied documents.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/ddate-0.2.1 b/app-misc/ddate-0.2.1
deleted file mode 100644
index 2adc0021e131..000000000000
--- a/app-misc/ddate-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<sys-apps/util-linux-2.20 !<sys-apps/util-linux-2.23[ddate] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Perpetual date converter from gregorian to poee calendar
-EAPI=6
-HOMEPAGE=https://github.com/bo0ts/ddate
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=public-domain
-RDEPEND=!<sys-apps/util-linux-2.20 !<sys-apps/util-linux-2.23[ddate]
-SLOT=0
-SRC_URI=https://github.com/bo0ts/ddate/archive/v0.2.1.tar.gz -> ddate-0.2.1.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=296b3c10dbbc5a47d2b026f2880b4a83
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
new file mode 100644
index 000000000000..f829ade5a82c
--- /dev/null
+++ b/app-misc/ddate/Manifest
@@ -0,0 +1,3 @@
+DIST ddate-0.2.1.tar.gz 7757 BLAKE2B b2899b325d5cb45b2aa2460fa900740c41c7790823958fcd1cf971713d61283e050737b0cecdd1988c60718e2741ba1d3a0a48442b4013d9727db6a3765da882 SHA512 377ae4be0ddd2386de726603116ec64a524f2f4263cb30d2cd8f10024659f5fee552cf13de45cbaad36c93d2dfd16c0667993d67a37ba2276a96ca052265c714
+EBUILD ddate-0.2.1.ebuild 665 BLAKE2B 976c1f0c0332d87d64147d0524f46f5971b4ea37477a42a70d4e4a63281c7eb02d4e41b5d66be204c1210372376a0ba8e0a5f415e858ed27cb189e298fe1cd2c SHA512 442a9548fc42ff0aa96f36020da4e6c840cc34dcdcb487d6be2c2efe3d71043fa98bb12f100a5c07dda3eed4ade983f8213e47a445c4bc9303583f0a68b04450
+MISC metadata.xml 219 BLAKE2B 9858286d68d75ce04ccfc658dc2fb021bac4342b211ac0cad2f57e64ee921af88be0fd6edb6c34c2f779207635cabcc390c8e72bad60d3772704714f31351fcc SHA512 6e64ad59ba9b06e33a75001a02ac552d3e5127ddfadeb4a06afa90d334718ec1516c71c6195538cb3fbca9998acff0239ce70a6a9b1d8dc393a1ff02fc24f168
diff --git a/app-misc/ddate/ddate-0.2.1.ebuild b/app-misc/ddate/ddate-0.2.1.ebuild
new file mode 100644
index 000000000000..b77bc135db42
--- /dev/null
+++ b/app-misc/ddate/ddate-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
+HOMEPAGE="https://github.com/bo0ts/ddate"
+SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="!<sys-apps/util-linux-2.20
+ !<sys-apps/util-linux-2.23[ddate]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i -e '/gzip/d' CMakeLists.txt || die
+}
+
+src_install() {
+ dobin "${CMAKE_BUILD_DIR}"/${PN}
+ doman ${PN}.1
+ dodoc README.org
+}
diff --git a/app-misc/ddate/metadata.xml b/app-misc/ddate/metadata.xml
new file mode 100644
index 000000000000..62bf9ab7eebb
--- /dev/null
+++ b/app-misc/ddate/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">bo0ts/ddate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ddccontrol-0.4.2_p20140105-r2 b/app-misc/ddccontrol-0.4.2_p20140105-r2
deleted file mode 100644
index 17c20ce53be3..000000000000
--- a/app-misc/ddccontrol-0.4.2_p20140105-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils ) dev-perl/XML-Parser dev-util/intltool sys-kernel/linux-headers doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DDCControl allows control of monitor parameters via DDC
-EAPI=5
-HOMEPAGE=http://ddccontrol.sourceforge.net/
-IUSE=doc gtk nls +pci static-libs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils )
-SLOT=0
-SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/9d89d8c0b959a4da62ecc50fb2aeb23142d4bfb4.tar.gz -> ddccontrol-0.4.2_p20140105.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f4161f4d746dd2dfac26cb7dadb017c2
diff --git a/app-misc/ddccontrol-db-20061014_p20121105 b/app-misc/ddccontrol-db-20061014_p20121105
deleted file mode 100644
index 58e0a2e67861..000000000000
--- a/app-misc/ddccontrol-db-20061014_p20121105
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) dev-util/intltool dev-perl/XML-Parser >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DDCControl monitor database
-EAPI=5
-HOMEPAGE=http://ddccontrol.sourceforge.net/
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=https://github.com/ddccontrol/ddccontrol-db/archive/130da80af5cd5d2897ffeed63362262262c6944f.tar.gz -> ddccontrol-db-20061014_p20121105.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e65036ce28a50a4d2f73c99a7565d0a7
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
new file mode 100644
index 000000000000..e060d6900e93
--- /dev/null
+++ b/app-misc/ddccontrol-db/Manifest
@@ -0,0 +1,3 @@
+DIST ddccontrol-db-20061014_p20121105.tar.gz 62043 BLAKE2B 558af647f21839f6df8a19cb84237aeb8ad5d023b1373de3180b9a88fcf7425d17797348cc0e2d44a4d5d1d715a429475873b82d0d8c728d8177b17d77b9cc42 SHA512 323c2ac498f634d20a183ea96e67868b8f3e8bb26da0133b91848b06accbef5605b3d5ca56b4861a8d28d9da9a28b11579a2e1fcc248624835190cdb01943c80
+EBUILD ddccontrol-db-20061014_p20121105.ebuild 788 BLAKE2B 2a786c6a164e37cef20302b79ffbbb960ba62605c2701eb71ab1f34b89082f2e0ba188fbb71e05cba73ea6697ff2bd9482f0c6660ab4addf0dad8364d2122a0e SHA512 8ccbdb0f3b5e5449fd07f8b6f76f362388479c7ab11ef4e10a20846eea003f0c7a85696f65ca40dd845b7535eab4f66360fa0cb54e8182f687ebd53201dd79ce
+MISC metadata.xml 318 BLAKE2B 7d2751717a71de1512a92f653a63ace19241e11dff6e2a0b982a87f3631757450b5c2430bf273c5d441e649569bd6612e5c199b37ac8da3f14b5f4440719eeaf SHA512 3ea6d2450579fd400199cc8c06193b9a0070c0efd4ed8016268d7e097ad35f5e0987fb1b6326076b736094df0c5976e33f1e4ef94ccccd789de6662f547d46ed
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
new file mode 100644
index 000000000000..aa4bd4bb42ea
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="130da80af5cd5d2897ffeed63362262262c6944f"
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-perl/XML-Parser"
+
+src_prepare(){
+ touch db/options.xml.h ABOUT-NLS config.rpath || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-misc/ddccontrol-db/metadata.xml b/app-misc/ddccontrol-db/metadata.xml
new file mode 100644
index 000000000000..c4fc6138be3c
--- /dev/null
+++ b/app-misc/ddccontrol-db/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">ddccontrol/ddccontrol-db</remote-id>
+ <remote-id type="sourceforge">ddccontrol</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
new file mode 100644
index 000000000000..c32fbb2faf98
--- /dev/null
+++ b/app-misc/ddccontrol/Manifest
@@ -0,0 +1,3 @@
+DIST ddccontrol-0.4.2_p20140105.tar.gz 177771 BLAKE2B eaaef394a6e9240d1742cc7fbd4ed80ff58315713d3977f8bd1c64f09465fb6a6f9cfb6ccb49e3190291256b6c816512128b95e2dfa16f31e8fadc2aa9367457 SHA512 7a28e9b81ee14e0431c57d372c8d43f861f61c35b441111e1f42d1aa62c333b0cc6a101dcb39d30e9661aaa85a02d755e4adef3a9b20a6952e1599e3ac12c72f
+EBUILD ddccontrol-0.4.2_p20140105-r2.ebuild 1895 BLAKE2B 6e51dc2d5ee49dfd3c77b680c285fc306edb2700019f51feff8892ed2b61310e4004190648fafda4fd5e5dab50c13b9e2ffe02b66372366bd709875ccba242fa SHA512 d4935772dfef9bd11a3f31609d8d160c18075f04f89274086716e493d796f6f14fc766fecbc89310de106789c2cc28e839a4d06b302c724e0b3f99b17fee28d2
+MISC metadata.xml 417 BLAKE2B 8bd8767a184790aea7b6a63383a56d25de54c68a044a6549683a979910bc6d6d8d518bcd71acd14b393f12a8c43cd8c7ba6bac1775f7ed28314bf56d4a97f9fd SHA512 8e2d095bfa5e56a10f9187894c34d1b8a4e6b3562c10c29ce374f5efde918f1d097e2678f044a838b31778bd7f9333c7fa7c41d2f9fc2011d263d4ea0831bf04
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild
new file mode 100644
index 000000000000..6744bc439b0b
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="9d89d8c0b959a4da62ecc50fb2aeb23142d4bfb4"
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+ dev-libs/libxml2:2
+ gtk? ( x11-libs/gtk+:2 )
+ nls? ( sys-devel/gettext )
+ pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-kernel/linux-headers
+ doc? (
+ >=app-text/docbook-xsl-stylesheets-1.65.1
+ >=dev-libs/libxslt-1.1.6
+ app-text/htmltidy
+ )"
+
+src_prepare() {
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+ sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+ # ppc/ppc64 do not have inb/outb/ioperm
+ # they also do not have (sys|asm)/io.h
+ if ! use amd64 && ! use x86 ; then
+ local card
+ for card in sis intel810 ; do
+ sed -r -i \
+ -e "/${card}.Po/d" \
+ -e "s~${card}[^[:space:]]*~ ~g" \
+ src/ddcpci/Makefile.{am,ini} || die
+ done
+ sed -i \
+ -e '/sis_/d' \
+ -e '/i810_/d' \
+ src/ddcpci/main.c || die
+ fi
+
+ ## Save for a rainy day or future patching
+ touch config.rpath ABOUT-NLS
+ eautoreconf
+ intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+ # amdadl broken, bug #527268
+ econf \
+ --htmldir='$(datarootdir)'/doc/${PF}/html \
+ --disable-gnome-applet \
+ --disable-amdadl \
+ $(use_enable doc) \
+ $(use_enable gtk gnome) \
+ $(use_enable nls) \
+ $(use_enable pci ddcpci) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
new file mode 100644
index 000000000000..e58743247549
--- /dev/null
+++ b/app-misc/ddccontrol/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <use>
+ <flag name="pci">enable direct PCI memory access (the setuid ddcpci util)</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ddccontrol/ddccontrol</remote-id>
+ <remote-id type="sourceforge">ddccontrol</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ddcutil-0.8.4 b/app-misc/ddcutil-0.8.4
deleted file mode 100644
index 0b2c2aeb7c6f..000000000000
--- a/app-misc/ddcutil-0.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig x11-libs/libXrandr x11-libs/libX11 dev-libs/glib:2 sys-apps/i2c-tools virtual/udev usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Program for querying and changing monitor settings
-EAPI=6
-HOMEPAGE=http://www.ddcutil.com/
-IUSE=usb-monitor user-permissions video_cards_nvidia kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXrandr x11-libs/libX11 dev-libs/glib:2 sys-apps/i2c-tools virtual/udev usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils )
-SLOT=0
-SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.4.tar.gz -> ddcutil-0.8.4.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0c476c90eff701544c725271effb6d0
diff --git a/app-misc/ddcutil-0.8.6 b/app-misc/ddcutil-0.8.6
deleted file mode 100644
index 73455ec9160d..000000000000
--- a/app-misc/ddcutil-0.8.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Program for querying and changing monitor settings
-EAPI=6
-HOMEPAGE=http://www.ddcutil.com/
-IUSE=drm usb-monitor user-permissions video_cards_nvidia X kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 )
-REQUIRED_USE=drm? ( X )
-SLOT=0
-SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1db6c0c81e273f9e91b42a4acd7d6c30
diff --git a/app-misc/ddcutil-0.8.6-r1 b/app-misc/ddcutil-0.8.6-r1
deleted file mode 100644
index b8a2ffd1b633..000000000000
--- a/app-misc/ddcutil-0.8.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Program for querying and changing monitor settings
-EAPI=6
-HOMEPAGE=http://www.ddcutil.com/
-IUSE=drm usb-monitor user-permissions video_cards_nvidia X kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) X? ( x11-libs/libXrandr x11-libs/libX11 )
-REQUIRED_USE=drm? ( X )
-SLOT=0
-SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f14d2f6e7eb06a525e52611cc8157cc9
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
new file mode 100644
index 000000000000..ef5613da20f9
--- /dev/null
+++ b/app-misc/ddcutil/Manifest
@@ -0,0 +1,7 @@
+AUX ddcutil-0.8.6-remove-pedantic-cflag.patch 3848 BLAKE2B f02ad02606aaef927823b7e50c319e4c4cc9a1a31836f3674ce5c7b140a5852fc62d1103c3ae2bb366f75176140c892ebb8381c3675ea3454493c8d2dcf7db17 SHA512 4f946476545a8af53a71d024d2765b26fbb871e04905c62e280ec4855bd1ebe2b0093660e3d9e384a106b512f783ca58cd0de78d40ffba1dae283026dd60bb9a
+DIST ddcutil-0.8.4.tar.gz 558405 BLAKE2B 4bb93d6b9b28a17ef182c1f39e3b6351070c5541fd8eefccde2a6d771e28a8c656abe1e00a58ee935290cba79af09b1c2d6b611532827455b5ec83532bbb46c4 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c
+DIST ddcutil-0.8.6.tar.gz 613272 BLAKE2B ce7072a819c5a2aa125ae8f6d5550cf0a516714f0635672015a0c24c9e525d34139c903ce7791955e0b30b8d4c66e94453eed60f8d8d024caccb49204d6fb853 SHA512 4ec473a37dc135700f4ce06634e6aa303199f4d743fba02c04ca509d0c31d45f59da7c6cd9818efc1fd8bc20dae518c5656fc8a38e9f00057677b1e997434fb0
+EBUILD ddcutil-0.8.4.ebuild 2948 BLAKE2B 17189cad5f87ec5f58dfbf9ff4b65edb2acc61a21b5ed7189d48a1e97794e2b2fe4f9493a91e01295200d5a5afb124d2a7bdd6f3eb4ff3d3cc474347a3bad833 SHA512 1a557b9d80cbb683ada7621876be9ad6b5f72d7227a28f292811d4c6460aba95a107dd58e9952d2c139255b1b530c04d5e4f7f09175b7871a0bd3ac593cacfb5
+EBUILD ddcutil-0.8.6-r1.ebuild 2729 BLAKE2B 0fd422fd07caeb03c144e31767ed77e707a6f25c63872e06030d12715bde8d39d9425d2e4fe5f2e5a97aad073b9d8e445f97d60e18c80d52e4aae7fb8399812e SHA512 e3dc3ff5d24f50147670e36cc68aa6ee96e2d79329a023ff7c6624b3de090018812f0a4e25cb39f5200eb7a420e3906afa6fe089d505dcd08806c1d75fbfe03a
+EBUILD ddcutil-0.8.6.ebuild 2671 BLAKE2B 7d1b0e7df93a63bb795c03a985950e1da7f16f36db76bdb2602d31fd014a3016956cf6bccfe98ef48eefc321ab62ed24b6bf26f2d6cac92198486f4819ed486e SHA512 1d0837c24c04c25b64bc4b9da0a528b65ad8a04adce135507d11b26dc8183e9be0e66243de3338298a613527e8e6e581e648f2f0783788d943e160e170db1404
+MISC metadata.xml 1293 BLAKE2B 185066701c363efd3520b07a9ea0cd70f94f0adfc10ea4d3cc624904c6bd66ea925bac4ccb53afa22bb7bb24b843e019fcf62e11a26c934ef16729a50f2a7117 SHA512 cb5e342c412ab146f28e75944a47d91b73b7148234c2f25966fe24993c595bff47c5e5b87bec82e07401b41338837d5425ca32f02cfee4df20d176954abb66d3
diff --git a/app-misc/ddcutil/ddcutil-0.8.4.ebuild b/app-misc/ddcutil/ddcutil-0.8.4.ebuild
new file mode 100644
index 000000000000..2da920970975
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# Binary drivers need special instructions compared to the open source counterparts.
+# If a user switches drivers, they will need to set different use flags for
+# Xorg or Wayland or Mesa, so this will trigger the rebuild against
+# the different drivers.
+# Remove ATI/AMD driver since it's masked for removal.
+# Will most likely need to set this for AMDGPU when in portage.
+IUSE="usb-monitor user-permissions video_cards_nvidia"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libX11
+ dev-libs/glib:2
+ sys-apps/i2c-tools
+ virtual/udev
+ usb-monitor? (
+ dev-libs/hidapi
+ virtual/libusb:1
+ sys-apps/usbutils )"
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+pkg_pretend() {
+ # This program needs /dev/ic2-* devices to communicate with the monitor.
+ CONFIG_CHECK="~I2C_CHARDEV"
+ ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+ if use usb-monitor; then
+ CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+ ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+ ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+ fi
+
+ # Now do the actual checks setup above
+ check_extra_config
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # Bug 607818.
+ replace-flags -O3 -O2
+
+ # Python API is still very experimental.
+ local myeconfargs=(
+ $(use_enable usb-monitor usb)
+ --disable-swig
+ --enable-lib
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ if use user-permissions; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+ if use usb-monitor; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if use user-permissions; then
+ enewgroup i2c
+ einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+ einfo "users to the i2c group: usermod -aG i2c user"
+ einfo "Restart the computer or reload the i2c-dev module to activate"
+ einfo "the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+ if use usb-monitor; then
+ enewgroup video
+ einfo "To allow non-root users access to USB monitors, add those users"
+ einfo "to the video group: usermod -aG video user"
+ einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+ einfo "the monitor to activate the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/usb/"
+ fi
+
+ udev_reload
+ fi
+
+ if use video_cards_nvidia; then
+ ewarn "Please read the following webpage on proper usage with the nVidia "
+ ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+ fi
+}
diff --git a/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..a1402f71b646
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+ sys-apps/i2c-tools
+ virtual/udev
+ drm? ( x11-libs/libdrm )
+ usb-monitor? (
+ dev-libs/hidapi
+ virtual/libusb:1
+ sys-apps/usbutils
+ )
+ X? (
+ x11-libs/libXrandr
+ x11-libs/libX11
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-remove-pedantic-cflag.patch )
+
+pkg_pretend() {
+ # This program needs /dev/ic2-* devices to communicate with the monitor.
+ CONFIG_CHECK="~I2C_CHARDEV"
+ ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+ if use usb-monitor; then
+ CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+ ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+ ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+ fi
+
+ # Now do the actual checks setup above
+ check_extra_config
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # Bug 607818.
+ replace-flags -O3 -O2
+
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable usb-monitor usb)
+ $(use_enable X x11)
+ --enable-lib
+ --disable-cffi
+ --disable-cython
+ --disable-swig
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ if use user-permissions; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+ if use usb-monitor; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if use user-permissions; then
+ enewgroup i2c
+ einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+ einfo "users to the i2c group: usermod -aG i2c user"
+ einfo "Restart the computer or reload the i2c-dev module to activate"
+ einfo "the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+ if use usb-monitor; then
+ enewgroup video
+ einfo "To allow non-root users access to USB monitors, add those users"
+ einfo "to the video group: usermod -aG video user"
+ einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+ einfo "the monitor to activate the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/usb/"
+ fi
+
+ udev_reload
+ fi
+
+ if use video_cards_nvidia; then
+ ewarn "Please read the following webpage on proper usage with the nVidia "
+ ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+ fi
+}
diff --git a/app-misc/ddcutil/ddcutil-0.8.6.ebuild b/app-misc/ddcutil/ddcutil-0.8.6.ebuild
new file mode 100644
index 000000000000..6444e7739e03
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+ sys-apps/i2c-tools
+ virtual/udev
+ drm? ( x11-libs/libdrm )
+ usb-monitor? (
+ dev-libs/hidapi
+ virtual/libusb:1
+ sys-apps/usbutils
+ )
+ X? (
+ x11-libs/libXrandr
+ x11-libs/libX11
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ # This program needs /dev/ic2-* devices to communicate with the monitor.
+ CONFIG_CHECK="~I2C_CHARDEV"
+ ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+ if use usb-monitor; then
+ CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+ ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+ ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+ fi
+
+ # Now do the actual checks setup above
+ check_extra_config
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # Bug 607818.
+ replace-flags -O3 -O2
+
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable usb-monitor usb)
+ $(use_enable X x11)
+ --enable-lib
+ --disable-cffi
+ --disable-cython
+ --disable-swig
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ if use user-permissions; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+ if use usb-monitor; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if use user-permissions; then
+ enewgroup i2c
+ einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+ einfo "users to the i2c group: usermod -aG i2c user"
+ einfo "Restart the computer or reload the i2c-dev module to activate"
+ einfo "the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+ if use usb-monitor; then
+ enewgroup video
+ einfo "To allow non-root users access to USB monitors, add those users"
+ einfo "to the video group: usermod -aG video user"
+ einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+ einfo "the monitor to activate the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/usb/"
+ fi
+
+ udev_reload
+ fi
+
+ if use video_cards_nvidia; then
+ ewarn "Please read the following webpage on proper usage with the nVidia "
+ ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+ fi
+}
diff --git a/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
new file mode 100644
index 000000000000..e20cc36459ec
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
@@ -0,0 +1,126 @@
+diff -urN a/src/app_sysenv/Makefile.am b/src/app_sysenv/Makefile.am
+--- a/src/app_sysenv/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/app_sysenv/Makefile.am 2018-01-28 20:16:44.143484825 +0000
+@@ -15,8 +15,8 @@
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/base/Makefile.am b/src/base/Makefile.am
+--- a/src/base/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/base/Makefile.am 2018-01-28 20:21:31.124936834 +0000
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+diff -urN a/src/cmdline/Makefile.am b/src/cmdline/Makefile.am
+--- a/src/cmdline/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/cmdline/Makefile.am 2018-01-28 20:20:32.178848976 +0000
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # flags g_option parser structs in cmd_parser_goption.c
+ # AM_CFLAGS += -Wpedantic
+
+diff -urN a/src/ddc/Makefile.am b/src/ddc/Makefile.am
+--- a/src/ddc/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/ddc/Makefile.am 2018-01-28 20:18:09.643626498 +0000
+@@ -11,8 +11,8 @@
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/i2c/Makefile.am b/src/i2c/Makefile.am
+--- a/src/i2c/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/i2c/Makefile.am 2018-01-28 20:17:30.271562118 +0000
+@@ -4,8 +4,8 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/sample_clients/Makefile.am b/src/sample_clients/Makefile.am
+--- a/src/sample_clients/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/sample_clients/Makefile.am 2018-01-28 20:19:57.230795822 +0000
+@@ -7,7 +7,7 @@
+ -I$(top_srcdir)/src
+
+ AM_CFLAGS = -Wall -fPIC
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+
+ check_PROGRAMS =
+ if ENABLE_SHARED_LIB_COND
+diff -urN a/src/test/Makefile.am b/src/test/Makefile.am
+--- a/src/test/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/test/Makefile.am 2018-01-28 20:19:03.509712410 +0000
+@@ -12,7 +12,7 @@
+
+
+
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/usb/Makefile.am b/src/usb/Makefile.am
+--- a/src/usb/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/usb/Makefile.am 2018-01-28 20:18:26.146653076 +0000
+@@ -5,7 +5,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/util/Makefile.am b/src/util/Makefile.am
+--- a/src/util/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/util/Makefile.am 2018-01-28 20:21:07.245901502 +0000
+@@ -3,7 +3,7 @@
+ $(LIBDRM_CFLAGS)
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # -pedantic issues warnings re code that doesn't conform to ISO C
+ # Alas, -m modifier on sscanf is a POSIX extension, not ISO C
+ # In combination with -Werror, causes device_util.c to fail compilation
+diff -urN a/src/vcp/Makefile.am b/src/vcp/Makefile.am
+--- a/src/vcp/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/vcp/Makefile.am 2018-01-28 20:19:28.024750741 +0000
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # vcp_feature_codes.c requires extensive changes if -Wpedantic
+ # AM_CFLAGS += -Wpedantic
+
diff --git a/app-misc/ddcutil/metadata.xml b/app-misc/ddcutil/metadata.xml
new file mode 100644
index 000000000000..7a944d0907c0
--- /dev/null
+++ b/app-misc/ddcutil/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dracwyrm@gentoo.org</email>
+ <name>Jonathan Scruggs</name>
+ </maintainer>
+ <longdescription>
+ ddcutil primarily uses DDC/CI (Display Data Channel Command Interface)
+ to communicate with monitors implementing MCCS (Monitor Control Command
+ Set) over I2C. Normally, the video driver for the monitor exposes the
+ I2C channel as devices named /dev/i2c-n. Alternatively, there is initial
+ support for monitors (such as Apple displays) that implement MCCS using
+ a USB connection.
+ </longdescription>
+ <use>
+ <flag name="drm" restrict="&gt;=app-misc/ddcutil-0.8.5">
+ Use <pkg>x11-libs/libdrm</pkg> for more verbose diagnostics.
+ </flag>
+ <flag name="user-permissions">
+ Adds a udev rules to allow non-root users in the i2c group to
+ access the /dev/i2c-* devices. If usb-monitor is selected, users
+ will need to be added to the video group to access the USB monitor.
+ Otherwise, only root will be able to use ddcutil.
+ </flag>
+ <flag name="usb-monitor">
+ Adds support for monitors attached via USB.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">rockowitz/ddcutil</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/delay-1.6-r2 b/app-misc/delay-1.6-r2
deleted file mode 100644
index cfb5c717b87a..000000000000
--- a/app-misc/delay-1.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sleeplike program that counts down the number of seconds specified
-EAPI=6
-HOMEPAGE=https://onegeek.org/~tom/software/delay/
-KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://onegeek.org/~tom/software/delay/dl/delay-1.6.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5fa09ac90480c4ea87a42d9f1eab70d8
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
new file mode 100644
index 000000000000..6f6558cf3f21
--- /dev/null
+++ b/app-misc/delay/Manifest
@@ -0,0 +1,5 @@
+AUX delay-1.6-headers.patch 156 BLAKE2B fa056fbf65029060d1d5291d78be65b8821d5fe4ef5f2e2b09abddd4dc0e28f35de97e8d7a01651c8c7eacc810cb093730b9a1ac81d0e784c26ebf0828ff6527 SHA512 5482c96f6c2f9ce5f0183751d36360a22b3bfc7e29c23ba13022e51f0f2569b77014be4544c95e7b76cb3947118b36ae5dd94afb26c1951bc7f4b0746d120ac1
+AUX delay-1.6-tinfo.patch 352 BLAKE2B 9ca59090f3d6483201a8133b204fc5948f7584285050787737a2cb23444ceff6d223fa1eb7c6a6d5712b95dc457c080efe930f041d1d03e55e3a393c27cfc484 SHA512 462e098e1a03ad1743fc758ca7ffabaeea07c430c24e5db6daffb786494176f91b1e6d99a34e867237ecd97fa4be8def415a14db6c53c9ea7b6ab4af3cf600a2
+DIST delay-1.6.tar.gz 69860 BLAKE2B f1823ff114279987c6ff2e7bb15634b27f0875fede7f879dfd69f6efee7f08f76f06673ad66853ea2e1e257174dde267455f92aadf2395dd5dd5aa731590aa51 SHA512 45d34b768082ff2e4a73f1af63239f6b9e418f1cb46e5945606c0e8830ba2b8c14eeb21d7e0776ef669d2834ed6dcc66c3ddb0225c182c77e85b18b5b28d5d43
+EBUILD delay-1.6-r2.ebuild 664 BLAKE2B 8b798d0e1f7f183bd533577fa897904a9da7b26a2fdd8cbb07aec6ab7e9dbb11d54c3f014066b4471de96d8527f2e4cda0b2db8125db8dfd0ecf55bb0fdac654 SHA512 152aaaf3fd42b47044c895e5de0efaca0b5600dd0ebbe20d3146a2bd9be54efdda913fdee09804c8ce2743b1c6fe27f785ff4cd886b6cc4e4d115a3d175606c4
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
new file mode 100644
index 000000000000..365857916fcf
--- /dev/null
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Sleeplike program that counts down the number of seconds specified"
+HOMEPAGE="https://onegeek.org/~tom/software/delay/"
+SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ eapply \
+ "${FILESDIR}"/${P}-headers.patch \
+ "${FILESDIR}"/${P}-tinfo.patch
+
+ mv configure.in configure.ac || die
+
+ default
+ eautoreconf
+}
diff --git a/app-misc/delay/files/delay-1.6-headers.patch b/app-misc/delay/files/delay-1.6-headers.patch
new file mode 100644
index 000000000000..5098435d7652
--- /dev/null
+++ b/app-misc/delay/files/delay-1.6-headers.patch
@@ -0,0 +1,10 @@
+--- a/delay.c
++++ b/delay.c
+@@ -17,6 +17,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <time.h>
+ #include <sys/time.h>
+ #include <unistd.h>
diff --git a/app-misc/delay/files/delay-1.6-tinfo.patch b/app-misc/delay/files/delay-1.6-tinfo.patch
new file mode 100644
index 000000000000..37a7fb27cdc6
--- /dev/null
+++ b/app-misc/delay/files/delay-1.6-tinfo.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -35,8 +35,11 @@
+ AC_STRUCT_TM
+ AC_STRUCT_TM_GMTOFF
+
+-AC_CHECK_LIB(curses, initscr)
+-AC_CHECK_HEADERS(curses.h)
++PKG_CHECK_MODULES([ncurses],[ncurses],[
++ LIBS="$LIBS $ncurses_LIBS"
++ AC_DEFINE([HAVE_CURSES_H])
++ AC_DEFINE([HAVE_LIBCURSES])],
++ [AC_MSG_ERROR([ncurses not found])])
+
+ AC_OUTPUT(Makefile)
+
diff --git a/app-misc/delay/metadata.xml b/app-misc/delay/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/delay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/detachtty-9-r1 b/app-misc/detachtty-9-r1
deleted file mode 100644
index 77f1ffd12cb2..000000000000
--- a/app-misc/detachtty-9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Attach/detach from interactive processes across the network
-EAPI=6
-HOMEPAGE=https://packages.debian.org/unstable/admin/detachtty
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/detachtty/detachtty_9.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0872eacb3a8d99cea1953af1b009aa0d
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
new file mode 100644
index 000000000000..4a91d5090cf1
--- /dev/null
+++ b/app-misc/detachtty/Manifest
@@ -0,0 +1,3 @@
+DIST detachtty_9.tar.gz 13081 BLAKE2B 28bb6a946d04717bc60ac7f65b791a8bb59a5ce1a2f7d7fabb63776538ade3fe046e874007effe7dd6ba7ebac8d739e16b0b0e2372ce4154385164d7939b498c SHA512 8ae7edc1a1c7727eb4d32a1a4327932e374ac838b441f34aee99cfe83e922f1d70383ab0aab2299808f28fea6229f5c122a7624b7ff992ab92b9c3f53483d035
+EBUILD detachtty-9-r1.ebuild 600 BLAKE2B 26747aa2903250488781353bcf93ecb0f66b086e63a691cd84725f3e9b7e7717927509aada2d64b017ca4a12c6cafb0c566ea7cf354b076c8a88032d8b6f0315 SHA512 4902bab8a023b424d9d6f1d583ab431b50375e878d0ed5e7e08840a762e4176dd56c681e632b01fb8a0bd20220c254af0b945561cbf272f5bdeae1f6a0759cda
+MISC metadata.xml 703 BLAKE2B 68c8ac450ee3a0fba9c9e217653526978c03635b843e9068f6c6e0937d927a030d78a9683f11f81273aaabb8c94f039f1211a1cc5b5ec58b2126d1ffdecc281e SHA512 00e9860010346c6dbad86cd3dd2eaea29f1e91df559b7f5b7dd634a48a0875830a46cab665efd3e3e87eafd6566ecec6ed6e4a691fdc48ebea327f527a312794
diff --git a/app-misc/detachtty/detachtty-9-r1.ebuild b/app-misc/detachtty/detachtty-9-r1.ebuild
new file mode 100644
index 000000000000..889f3998d57b
--- /dev/null
+++ b/app-misc/detachtty/detachtty-9-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="Attach/detach from interactive processes across the network"
+HOMEPAGE="https://packages.debian.org/unstable/admin/detachtty"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin "${PN}" attachtty
+ doman "${PN}.1"
+ dosym detachtty.1 /usr/share/man/man1/attachtty.1
+ einstalldocs
+}
diff --git a/app-misc/detachtty/metadata.xml b/app-misc/detachtty/metadata.xml
new file mode 100644
index 000000000000..d83290efbddf
--- /dev/null
+++ b/app-misc/detachtty/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+</maintainer>
+<maintainer type="project">
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+</maintainer>
+<longdescription>
+detachtty is a utility that lets you run interactive programs non-interactively.
+Reattaching can be done locally or over the network. detachtty is similar in
+concept to GNU Screen but is better suited toward scrolling interfaces (not
+full-screen, random-access based applications).
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/detox-1.2.0-r3 b/app-misc/detox-1.2.0-r3
deleted file mode 100644
index 8b0e64bcf986..000000000000
--- a/app-misc/detox-1.2.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/popt sys-devel/flex sys-devel/bison
-DESCRIPTION=Safely remove spaces and strange characters from filenames
-EAPI=5
-HOMEPAGE=http://detox.sourceforge.net/
-KEYWORDS=amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/popt
-SLOT=0
-SRC_URI=mirror://sourceforge/detox/detox-1.2.0.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c58d4b6f62d02b8c0701cd41a4e4d800
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
new file mode 100644
index 000000000000..23b1a3d33819
--- /dev/null
+++ b/app-misc/detox/Manifest
@@ -0,0 +1,8 @@
+AUX detox-1.2.0-LDFLAGS.patch 501 BLAKE2B d0a989cb0a4a251e4c0c73efee3072c4e7a67c23482be0095d8a4c7307d1198b2fa9f3eaa492014e3d2504c1c5513423f8fc39856775b2aabf304c8a1f0835b3 SHA512 a3d59bef705d763be2831d03ccfef5fd69859a8e6f6900a1b6558135d2fa38a7844c16276bedab1b5af15f3e287cada615ea4c83f4c6737919c7c55daa7e55bf
+AUX detox-1.2.0-change-default-sequence-to-use-utf8-table.patch 379 BLAKE2B 753b6c0dc72ff972501787c927aaf77f97a4e9fc33d60151bc9f2eaeb0f7ab05b8876e42da56bdf8702d032ade8d0042596c0766a58cd81d7e2e8ab5d3957be1 SHA512 8804afdb7a5b37b01d2e16d68ae2e7b381cdfe75fd10de7a20388079bce9f137765e11b4e1d8d4cdabc6e521af7deb3309d84e42308e4c9108edb9537cb2706e
+AUX detox-1.2.0-format-security.patch 1964 BLAKE2B 41074dae01426f5a3293ba36dca12d950ffe6175ff2355263d6e0e68ca951f7ef30d07810c00e8456ca68fe03b7dab3a0740cbc5e2adb0d7041741deb00606d4 SHA512 c0ce9ac00500399a28bc4d2bc4dff5c20386817d154c2185ebf29df1544ff400199d2884139f7f68c3f5e260d1742877f0b8b53787d8a585f9ff04028f878a2a
+AUX detox-1.2.0-install-missing-file.patch 642 BLAKE2B 232a89c132c681d47243411c42c0975ec1c0ef493f7015db3591b89abf0b294e7fddeb7afabd992180ad7cd60031fd0f60aa228daa31b59116d7251a697d856c SHA512 32f83f700a508729c27941ae627c544dd2ba1900a647285d4160038e69dbad8f1205c5056daa9c5c19a56a70a6e528db187a59d56dfcfee7d772eb0fd809d087
+AUX detox-1.2.0-parallel.patch 1120 BLAKE2B bccae5f969e1127b8819a5542354ea2aaac765a3667679598d4edd5d3dd6bfac45845718599be59bbebc11d860d6fc56163777e3e3940da0805b9d5cc1bcf0bd SHA512 5a9c964cd46a1cd4463460a400226a80a9c1705bd60655362ca02950a06acacbafed1c039793eb6445988e91a47888dbf1c643bf8c34003e7c34a02398f58855
+DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
+EBUILD detox-1.2.0-r3.ebuild 972 BLAKE2B e30b2d58d2b5815d54467970e7ddaa1e48810b3ae6540e28e7d4468aad99b1411f6eafba589ef31530e629ec60d4299c629a7715d6105f8b6e6ea94528b4f849 SHA512 6daffbe667fc692b837b0b66f17294464b7f5d9886a790c15bc4e93ddeb84d05bde89526029790dc484fdb6bb4939ed8517aa4840e92af5d63341e26be645b19
+MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..cbae89b41864
--- /dev/null
+++ b/app-misc/detox/detox-1.2.0-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Safely remove spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-parallel.patch
+ "${FILESDIR}"/${P}-LDFLAGS.patch
+ "${FILESDIR}"/${P}-change-default-sequence-to-use-utf8-table.patch
+ "${FILESDIR}"/${P}-install-missing-file.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ )
+
+src_prepare() {
+ sed \
+ -e 's:Fl c Ar:Fl f Ar:g' \
+ -i ${PN}.1 || die
+ epatch "${PATCHES[@]}"
+ sed \
+ -e '/detoxrc.sample/d' \
+ -i Makefile.in || die
+}
+
+src_configure() {
+ econf --with-popt="${EPREFIX}/usr"
+}
diff --git a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
new file mode 100644
index 000000000000..3f0daa088010
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
@@ -0,0 +1,18 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=2166388&group_id=101612&atid=630105
+
+--- Makefile.in 2008-10-14 16:37:22 +0000
++++ Makefile.in 2008-10-14 16:38:17 +0000
+@@ -70,10 +70,10 @@
+ #
+
+ detox: ${detoxOBJS}
+- ${CC} -o detox ${detoxOBJS} ${L_OPT}
++ ${CC} ${LDFLAGS} -o detox ${detoxOBJS} ${L_OPT}
+
+ inline-detox: ${inline-detoxOBJS}
+- ${CC} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
++ ${CC} ${LDFLAGS} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
+
+ #
+ # Special Source Compiles
+
diff --git a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
new file mode 100644
index 000000000000..2e54642f45b9
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
@@ -0,0 +1,17 @@
+# Patch from Teemu Likonen <tlikonen@iki.fi>
+# to change the default sequence to use utf8 instead of iso8859-1
+--- detox-1.2.0/detoxrc~ 2006-07-03 19:45:54.000000000 +0300
++++ detox-1.2.0/detoxrc 2009-05-28 15:34:26.497832449 +0300
+@@ -32,10 +32,10 @@
+ #
+
+ #
+-# Basically just ISO8859_1
++# Basically just utf_8
+ #
+ sequence default {
+- iso8859_1;
++ utf_8;
+ safe;
+ wipeup;
+ };
diff --git a/app-misc/detox/files/detox-1.2.0-format-security.patch b/app-misc/detox/files/detox-1.2.0-format-security.patch
new file mode 100644
index 000000000000..c03a98aa046c
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-format-security.patch
@@ -0,0 +1,72 @@
+ parse_options_getopt.c | 8 ++++----
+ parse_options_popt.c | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/parse_options_getopt.c b/parse_options_getopt.c
+index 1f80966..ea2b266 100644
+--- a/parse_options_getopt.c
++++ b/parse_options_getopt.c
+@@ -98,9 +98,9 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
+ #endif
+ switch (optcode) {
+ case 'h':
+- printf(usage_message);
++ printf("%s", usage_message);
+ printf("\n");
+- printf(help_message);
++ printf("%s", help_message);
+ exit(EXIT_SUCCESS);
+
+ case 'f':
+@@ -138,7 +138,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
+ exit(EXIT_SUCCESS);
+
+ case '?':
+- printf(usage_message);
++ printf("%s", usage_message);
+ exit(EXIT_SUCCESS);
+
+ case 0:
+@@ -195,7 +195,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
+ }
+ else {
+ #ifndef INLINE_MODE
+- printf(usage_message);
++ printf("%s", usage_message);
+ exit(EXIT_FAILURE);
+ #endif
+ }
+diff --git a/parse_options_popt.c b/parse_options_popt.c
+index 60dad7a..370c3cc 100644
+--- a/parse_options_popt.c
++++ b/parse_options_popt.c
+@@ -94,9 +94,9 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
+ while ((c = poptGetNextOpt(optCon)) >= 0) {
+ switch (c) {
+ case 'h':
+- printf(usage_message);
++ printf("%s", usage_message);
+ printf("\n");
+- printf(help_message);
++ printf("%s", help_message);
+ exit(EXIT_SUCCESS);
+
+ case 'f':
+@@ -142,7 +142,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
+ break;
+
+ case '?':
+- printf(usage_message);
++ printf("%s", usage_message);
+ exit(EXIT_SUCCESS);
+
+ }
+@@ -177,7 +177,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
+
+ #ifndef INLINE_MODE
+ if (i == 0) {
+- fprintf(stderr, usage_message);
++ fprintf(stderr, "%s", usage_message);
+ exit(EXIT_FAILURE);
+ }
+ #endif
diff --git a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
new file mode 100644
index 000000000000..97863268bc48
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
@@ -0,0 +1,18 @@
+# Patch by Nelson A. de Oliveira <naoliv@debian.org>
+#
+# Patch upstream Makefile to install missing safe.tbl (#566785)
+
+--- detox-1.2.0/Makefile.in 2010-06-20 23:41:34.000000000 -0300
++++ detox-1.2.0/Makefile.in 2010-06-20 23:42:34.000000000 -0300
+@@ -147,6 +147,11 @@
+ else \
+ echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
+ fi
++ @if [ ! -f ${DESTDIR}${datadir}/detox/safe.tbl ]; then \
++ ${INSTALL} -m 644 safe.tbl ${DESTDIR}${datadir}/detox; \
++ else \
++ echo "${DESTDIR}${datadir}/detox/safe.tbl exists, skipping"; \
++ fi
+
+ install-unsafe-config: install-base
+ ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
diff --git a/app-misc/detox/files/detox-1.2.0-parallel.patch b/app-misc/detox/files/detox-1.2.0-parallel.patch
new file mode 100644
index 000000000000..73abd73d61b3
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-parallel.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=2166387&group_id=101612&atid=630105
+
+--- Makefile.in 2008-10-14 16:39:34 +0000
++++ Makefile.in 2008-10-14 16:38:51 +0000
+@@ -131,7 +131,7 @@
+ ${INSTALL} -m 644 detox.1 ${DESTDIR}${mandir}/man1
+ ${INSTALL} -m 644 detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5
+
+-install-safe-config:
++install-safe-config: install-base
+ @if [ ! -f ${DESTDIR}${sysconfdir}/detoxrc ]; then \
+ ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}; \
+ else \
+@@ -148,12 +148,12 @@
+ echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
+ fi
+
+-install-unsafe-config:
++install-unsafe-config: install-base
+ ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
+ ${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox
+ ${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox
+
+-install-sample-config:
++install-sample-config: install-base
+ ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}/detoxrc.sample
+ ${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox/iso8859_1.tbl.sample
+ ${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox/unicode.tbl.sample
+
diff --git a/app-misc/detox/metadata.xml b/app-misc/detox/metadata.xml
new file mode 100644
index 000000000000..f86cf813cf30
--- /dev/null
+++ b/app-misc/detox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">detox</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/devtodo-0.1.20-r3 b/app-misc/devtodo-0.1.20-r3
deleted file mode 100644
index a800bb4a544a..000000000000
--- a/app-misc/devtodo-0.1.20-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/ncurses-5.2:0= >=sys-libs/readline-4.1:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A nice command line todo list for developers
-EAPI=5
-HOMEPAGE=http://swapoff.org/DevTodo
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= >=sys-libs/readline-4.1:0=
-SLOT=0
-SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b55362261a3b60b40288bf790718698f
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
new file mode 100644
index 000000000000..049741e572bf
--- /dev/null
+++ b/app-misc/devtodo/Manifest
@@ -0,0 +1,7 @@
+AUX devtodo-0.1.20-bashcom_spaces.patch 1077 BLAKE2B f4c2a9fbcda727ceee4f28376331744856845dbc4eda1fdfd9cfaad254ad0119b7b687053eafdb6791f046f65b8d3dcc839a9c95207991eca2731550eb0de326 SHA512 8e2934b40fba0397fc21ca9084ddb0c6f65fd9715656dd520fd90ece7c04be2d5733e52a568d1786e9a7fea3dc58f4eb4ce988ace6dc8fa23a8b9a192b6fa54b
+AUX devtodo-0.1.20-gcc43.patch 217 BLAKE2B 9d8af6ddf3036120498fda96bc493b3ce5e480e678e2ca4eb07917857383728390e45f1947c765003bad76f77e951a595edfa5b500137f6189489cc678c994a3 SHA512 2a34a52467f61704031dc1ab568c5909fa165d6f4fcf007726611e80437b805fe70a16d3ed6080d5ad83dd934a05fdf3de46a0a84e5679efbdd0ca2e41b8a99c
+AUX devtodo-0.1.20-gentoo.diff 3744 BLAKE2B f80130ba310593442d92013a51186af2ec082c0c4cde25981432ccab76a77dad38197e8d84b9939d3ad78e6442196315b446d431daa675bb082e488723b86a48 SHA512 f2a6de30807c2ec718725491d92f4906c50b944eff389e15d17cb2982127112d443e08096b6923ca76ca720832afc1fd561bd55a327ffa435e1e21abda07abbb
+AUX devtodo.bash-completion 1424 BLAKE2B 10166a35074d1f501d76a0f60e383c6f6198242b4c22ae2b17468f887e2d6caa2466bbfae290d76cf8199156703591633aaa755298c7ebcd1274faa09656a369 SHA512 6139218a2bc4d06f2af23fc04247e8fa3d70eaf3affe326dbb8b1bbbb880f2534f1c1bf4c54079231bed7c1c64465705deb5a5cb1a0f4ca5415ccddae726b20b
+DIST devtodo-0.1.20.tar.gz 390935 BLAKE2B 1605fb6ae6f416ea9b7c072463aacedf7fe997a362b3188addce9c6fbdd9bf99f2f7d4524870fb09f0a0c29e9886011a8fae737388a3151ecc489f3fe4fec980 SHA512 58cff0455c735af4530fc9321d1eade8272dd5759eeb8a688a641c9be11830b87be116801e3cd1d90a27e070775fa00d7b4d6b3399eba7aad5c752bfda9c28fb
+EBUILD devtodo-0.1.20-r3.ebuild 1678 BLAKE2B 318be2820e5ef69b7a38a112f440089b6cf7b0fcddb07a991c586bfe23151b32871d34c77383c128425bdd7dbd8f67c236fbafa273ebf2a6ef746ecf2647c8fd SHA512 4f5de8e5e1c034cba934df1e488e86933b118d5288ea6a17863d5ef297050dabc5928424746d28096087e8666b617ed99cab4cbcd701924830775cf09b1dd714
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
new file mode 100644
index 000000000000..41dc7c7ac58b
--- /dev/null
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A nice command line todo list for developers"
+HOMEPAGE="http://swapoff.org/DevTodo"
+SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ >=sys-libs/readline-4.1:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog QuickStart README doc/scripts.sh doc/scripts.tcsh doc/todorc.example )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.diff
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-bashcom_spaces.patch
+)
+
+src_prepare() {
+ # fix regex.h issue on case-insensitive file-systems #332235
+ sed \
+ -e 's/Regex.h/DTRegex.h/' \
+ -i util/Lexer.h util/Makefile.{am,in} util/Regex.cc || die
+ mv util/{,DT}Regex.h || die
+
+ sed \
+ -e "/^LIBS/s:$: $($(tc-getPKG_CONFIG) --libs ncursesw):g" \
+ -i src/Makefile.am || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ replace-flags -O[23] -O1
+
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}/etc/devtodo"
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ newbashcomp contrib/${PN}.bash-completion ${PN}
+ rm contrib/${PN}.bash-completion || die 'rm failed'
+
+ bashcomp_alias devtodo tda tdd tde tdr todo
+
+ dodoc -r contrib
+}
+
+pkg_postinst() {
+ elog "Because of a conflict with app-misc/tdl, the tdl symbolic link"
+ elog "and manual page have been removed."
+}
diff --git a/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch b/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch
new file mode 100644
index 000000000000..8567ab4b0562
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch
@@ -0,0 +1,32 @@
+ contrib/devtodo.bash-completion | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/contrib/devtodo.bash-completion b/contrib/devtodo.bash-completion
+index 07139b0..c058dad 100644
+--- a/contrib/devtodo.bash-completion
++++ b/contrib/devtodo.bash-completion
+@@ -15,20 +15,20 @@ _devtodo() {
+ --purge"
+
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
++ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+
+ case "${prev}" in
+ -p|--priority)
+ COMPREPLY=( $(compgen -W "default veryhigh high medium low verylow" \
+- -- ${cur}) )
++ -- "${cur}") )
+ ;;
+ --database-loaders)
+- COMPREPLY=( $(compgen -W "xml binary" -- ${cur}) )
++ COMPREPLY=( $(compgen -W "xml binary" -- "${cur}") )
+ ;;
+ -l|--link|--*database)
+- COMPREPLY=( $(compgen -f -- ${cur}) )
++ _filedir
+ ;;
+ *)
+ COMPREPLY=()
diff --git a/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch b/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch
new file mode 100644
index 000000000000..f9f920545805
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch
@@ -0,0 +1,10 @@
+--- devtodo-0.1.20.orig/src/todoterm.cc
++++ devtodo-0.1.20/src/todoterm.cc
+@@ -2,6 +2,7 @@
+ #include "todoterm.h"
+
+ #ifdef USETERMCAP
++#include <cstdlib>
+ #include <iostream>
+ #include <string>
+ #include <stdexcept>
diff --git a/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff
new file mode 100644
index 000000000000..05c36a31880c
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff
@@ -0,0 +1,85 @@
+--- devtodo-0.1.20.orig/doc/devtodo.1.in 2004-12-17 10:21:09.135350872 -0500
++++ devtodo-0.1.20/doc/devtodo.1.in 2004-12-17 10:21:34.050210242 -0500
+@@ -20,9 +20,6 @@
+ .TP
+ \fBtdd \fI<indices>\fP\fP
+ Mark the specified items as being done.
+-.TP
+-\fBtdl [\-g \fI<index>\fP] \fI<database>\fP\fP
+-Link the specified devtodo database into the current one, optionally grafting it as a child of the specified index.
+ .SH "DESCRIPTION"
+ .LP
+ \fBtodo\fP is a program aimed specifically at programmers (but usable by anybody at the terminal) to aid in day\-to\-day development.
+@@ -372,6 +369,10 @@
+ .TP
+ \fB~/.todorc\fR
+ User-specific options are specified in this file. Please refer to the section \fBTODORC\fR for more information.
++.SH "BUGS"
++.LP
++Because of a conflict with app-misc/tdl, the tdl symbolic link and the tdl manual page have been removed.
++See \fIhttp://bugs.gentoo.org/show_bug.cgi?id=55371\fR for more information.
+ .SH "AUTHORS"
+ .LP
+ Alec Thomas \fI<alec@swapoff.org>\fR
+--- devtodo-0.1.20.orig/doc/Makefile.am 2004-12-17 10:21:09.135350872 -0500
++++ devtodo-0.1.20/doc/Makefile.am 2004-12-17 10:21:34.050210242 -0500
+@@ -1,5 +1,5 @@
+ man_MANS=devtodo.1
+-manlinks=tda tdr tdd tde tdl todo
++manlinks=tda tdr tdd tde todo
+
+ install-data-local:
+ mkdir -p $(DESTDIR)$(mandir)/man1
+--- devtodo-0.1.20.orig/src/TodoDB.cc 2004-12-17 10:21:09.136350706 -0500
++++ devtodo-0.1.20/src/TodoDB.cc 2004-12-17 10:21:34.054209577 -0500
+@@ -949,7 +948,11 @@
+ if (out.bad())
+ throw exception("couldn't open TODO for generation");
+
+- if (titleText != "") wraptext(out, titleText, 0, options.columns);
++ if (titleText != "") {
++ wraptext(out, titleText, 0, options.columns);
++ out << endl << endl;
++ }
++
+ if (options.verbose > 1)
+ cout << "todo: generating using format '" << options.format["verbose-generated"] << "'" << endl;
+ filterView();
+--- devtodo-0.1.20/contrib/devtodo.bash-completion {cset 9b4d9f02-fdb7-4641-b07f-7359b794d6b0}
++++ devtodo-0.1.20/contrib/devtodo.bash-completion {local clone}
+@@ -35,6 +35,6 @@ _devtodo() {
+ ;;
+ esac
+ }
+-complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd tdl
++complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd
+
+ # vim: set ft=sh tw=80 sw=4 et :
+--- devtodo-0.1.20/src/support.cc {cset 5f5bd9cb-18fb-4046-bff5-4f3dbd781e47}
++++ devtodo-0.1.20/src/support.cc {local clone}
+@@ -289,11 +289,10 @@ enum { Help = -100, Remove, Version, Tit
+ << "Where <arguments> can be any of the following:" << endl;
+ args.displayHelp(cout, options.columns);
+ cout << endl
+- << "In addition, there are five convenience symlinks. These are 'tda', 'tdr'," << endl
+- << "'tdd', 'tde', and 'tdl'. For 'tde', 'tdd' and 'tdr' supply an index to edit," << endl
++ << "In addition, there are four convenience symlinks. These are 'tda', 'tdr'," << endl
++ << "'tdd', and 'tde'. For 'tde', 'tdd' and 'tdr' supply an index to edit," << endl
+ << "mark done and remove respectively. For 'tda' supply the text of the todo item" << endl
+- << "item and optionally the priority. For 'tdl' supply the path to another todo" << endl
+- << "file to link in to the current todo file." << endl
++ << "item and optionally the priority." << endl
+ << "eg. tde 1" << endl;
+ exit(0);
+ break;
+--- devtodo-0.1.20/src/Makefile.am 2007-09-17 12:12:55.000000000 +0200
++++ devtodo-0.1.20/src/Makefile.am 2007-09-17 12:13:43.000000000 +0200
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS=devtodo
+ devtodo_SOURCES=Todo.cc Todo.h TodoDB.cc TodoDB.h support.cc support.h \
+ main.cc todoterm.cc todoterm.h Loaders.cc Loaders.h todorl.h
+-binlinks=tda tdr tdd tdl tde todo
++binlinks=tda tdr tdd tde todo
+
+ devtodo_LDADD=../util/libutil.la
+ INCLUDES=-I../util
diff --git a/app-misc/devtodo/files/devtodo.bash-completion b/app-misc/devtodo/files/devtodo.bash-completion
new file mode 100644
index 000000000000..9e2869a9e5d6
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo.bash-completion
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# bash command-line completion for devtodo
+# Author: Aaron Walker <ka0ttic@gentoo.org>
+
+_devtodo() {
+ local cur prev opts
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-v --verbose -a --add -g --graft -l --link -R --reparent
+ -p --priority -e --edit --remove -d --done -D --not-done
+ --global-database -G --global --database -T --TODO -A --all
+ -f --filter --colour --force-colour --mono --help --version
+ --title --date-format --format --use-format --sort --paranoid
+ --database-loaders --backup -s --summary -c --comment --timeout
+ --purge"
+
+ if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ return 0
+ fi
+
+ case "${prev}" in
+ -p|--priority)
+ COMPREPLY=( $(compgen -W "default veryhigh high medium low verylow" \
+ -- ${cur}) )
+ ;;
+ --database-loaders)
+ COMPREPLY=( $(compgen -W "xml binary" -- ${cur}) )
+ ;;
+ -l|--link|--*database)
+ COMPREPLY=( $(compgen -f -- ${cur}) )
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+}
+complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd
+
+# vim: set ft=sh tw=80 sw=4 et :
diff --git a/app-misc/devtodo/metadata.xml b/app-misc/devtodo/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/devtodo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/digitemp-3.5.0-r2 b/app-misc/digitemp-3.5.0-r2
deleted file mode 100644
index 38223e123fe0..000000000000
--- a/app-misc/digitemp-3.5.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=ds2490? ( virtual/libusb:0 )
-DESCRIPTION=Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol
-EAPI=5
-HOMEPAGE=https://www.digitemp.com/ https://www.ibutton.com/
-IUSE=ds9097 ds9097u ds2490
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.digitemp.com/software/linux/digitemp-3.5.0.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a4eeceb38d6f42d738c30ea04d0944e1
diff --git a/app-misc/digitemp-3.7.1 b/app-misc/digitemp-3.7.1
deleted file mode 100644
index 15083f93ee58..000000000000
--- a/app-misc/digitemp-3.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=ds2490? ( virtual/libusb:0 )
-DESCRIPTION=Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol
-EAPI=5
-HOMEPAGE=https://www.digitemp.com/ https://www.ibutton.com/
-IUSE=ds9097 ds9097u ds2490
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/bcl/digitemp/archive/v3.7.1.tar.gz -> digitemp-3.7.1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ab03bc9fae8a76123239b93a4d3fd33f
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
new file mode 100644
index 000000000000..859be87da990
--- /dev/null
+++ b/app-misc/digitemp/Manifest
@@ -0,0 +1,5 @@
+DIST digitemp-3.5.0.tar.gz 267947 BLAKE2B bdd5cd84160d4826205ac74676897b9caa296c203fcde738c99f89baaeb7637f3995afeb7741e1d1d3e6cb64776de2479fe7d54d1b499a400cbf7b59f8d46349 SHA512 59055a97ae35cdc86bb893a755975b688d3be9185e717f5da0024d664e6c93dd5a7f10f1230772c3bc1bc76a088392da083ba63d28e054727b9f68ce31de64d3
+DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
+EBUILD digitemp-3.5.0-r2.ebuild 1826 BLAKE2B a9cfe9ca027e64237c2e46a8e1f216e0824eccec720c84e9e17fcae440c058ef4cc49e366259e075de879c0fe9014dbffc1a088b1a91a2674efe84872e06a5ee SHA512 2dc36c29e0c64c9f87372493d0aefb26105af1cee219c51ed6c4d224a378cec9a793fdcbfccbfa3bc1f94733ce286f8562fede0bfa1626faee3995aefa0f63f6
+EBUILD digitemp-3.7.1.ebuild 1845 BLAKE2B 8a2fd58c5505e05edf1982b14dc89e589e498b948d15647ab9ff8061ae25b088715a2b701878e938cbf8e483222283d810dd546aecb4464d95ad239678587f4b SHA512 7d6d89ef1d5f3d8bd154073f8dcf05d40847ec9d202b3c03b3ca42d22fdcb78560f11c090a26bdae07cc5ee9def88c3de98fe8e05f12427ea4ec2ef90605acca
+MISC metadata.xml 982 BLAKE2B 9a74eb54a17f249dd527e5aa4b292dadce934da1d1303ba6ca3bb5503c5e235836261495af1eb3c04e0322725c46838b1c902e8f5862856edb3696a147a74184 SHA512 8dda9bc7dff244e54e4951d553f2255bd1da1279221374fc514b5483e36ae129fc9e154c8bf07bf66b3ddc9b2bdac172184b3d9b89c06852f0f9f2237de627a2
diff --git a/app-misc/digitemp/digitemp-3.5.0-r2.ebuild b/app-misc/digitemp/digitemp-3.5.0-r2.ebuild
new file mode 100644
index 000000000000..cd0f7c008a75
--- /dev/null
+++ b/app-misc/digitemp/digitemp-3.5.0-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
+HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
+SRC_URI="https://www.digitemp.com/software/linux/${P}.tar.gz"
+
+IUSE="ds9097 ds9097u ds2490"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+DEPEND="ds2490? ( virtual/libusb:0 )"
+
+targets() {
+ # default is to compile to the ds9097u.
+ if ! ( use ds9097 || use ds9097u || use ds2490 ); then
+ echo ds9097u
+ fi
+ for target in ds9097 ds9097u ds2490; do
+ if use ${target}; then
+ echo ${target}
+ fi
+ done
+}
+
+src_prepare() {
+ sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+ -e "/^LIBS/s:=:= ${LDFLAGS}:" Makefile
+ # default is to compile to the ds9097u.
+ if ! ( use ds9097 || use ds9097u || use ds2490 ); then
+ ewarn "If you don't choose a component to install, we default to ds9097u"
+ fi
+}
+
+src_compile() {
+ local targets=$(targets)
+
+ for target in $targets; do
+ emake clean
+ emake CC="$(tc-getCC)" LOCK="no" ${target} || die "emake ${target} failed"
+ done
+}
+
+src_install() {
+ for target in $(echo $(targets) | tr '[:lower:]' '[:upper:]'); do
+ dobin digitemp_${target} && \
+ dosym digitemp_${target} /usr/bin/digitemp
+ done
+
+ if [[ $(targets|wc -l) -ge 1 ]]; then
+ echo
+ ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}"
+ ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*"
+ echo
+ fi
+
+ dodoc README FAQ TODO
+
+ for example in perl python rrdb; do
+ insinto "/usr/share/doc/${PF}/${example}_examples"
+ doins -r ${example}/*
+ done
+}
+
+pkg_postinst() {
+ echo
+ elog "Examples of using digitemp with python, perl, and rrdtool are"
+ elog "located in /usr/share/doc/${PF}/"
+ echo
+}
diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild
new file mode 100644
index 000000000000..718f8d20bbf8
--- /dev/null
+++ b/app-misc/digitemp/digitemp-3.7.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
+HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
+SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="ds9097 ds9097u ds2490"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="ds2490? ( virtual/libusb:0 )"
+
+targets() {
+ # default is to compile to the ds9097u.
+ if ! ( use ds9097 || use ds9097u || use ds2490 ); then
+ echo ds9097u
+ fi
+ for target in ds9097 ds9097u ds2490; do
+ if use ${target}; then
+ echo ${target}
+ fi
+ done
+}
+
+src_prepare() {
+ sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+ -e "/^LIBS/s:=:= ${LDFLAGS}:" Makefile
+ # default is to compile to the ds9097u.
+ if ! ( use ds9097 || use ds9097u || use ds2490 ); then
+ ewarn "If you don't choose a component to install, we default to ds9097u"
+ fi
+}
+
+src_compile() {
+ local targets=$(targets)
+
+ for target in $targets; do
+ emake clean
+ emake CC="$(tc-getCC)" LOCK="no" ${target} || die "emake ${target} failed"
+ done
+}
+
+src_install() {
+ for target in $(echo $(targets) | tr '[:lower:]' '[:upper:]'); do
+ dobin digitemp_${target} && \
+ dosym digitemp_${target} /usr/bin/digitemp
+ done
+
+ if [[ $(targets|wc -l) -ge 1 ]]; then
+ echo
+ ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}"
+ ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*"
+ echo
+ fi
+
+ dodoc README FAQ TODO
+
+ for example in perl python rrdb; do
+ insinto "/usr/share/doc/${PF}/${example}_examples"
+ doins -r ${example}/*
+ done
+}
+
+pkg_postinst() {
+ echo
+ elog "Examples of using digitemp with python, perl, and rrdtool are"
+ elog "located in /usr/share/doc/${PF}/"
+ echo
+}
diff --git a/app-misc/digitemp/metadata.xml b/app-misc/digitemp/metadata.xml
new file mode 100644
index 000000000000..7ed6505057eb
--- /dev/null
+++ b/app-misc/digitemp/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription>
+DigiTemp is a simple to use program for reading values from 1-wire devices. Its
+main use is for reading temperature sensors, but it also reads counters, and
+understands the 1-wire hubs with devices on different branches of the network.
+DigiTemp now supports the following 1-wire temperature sensors: DS18S20 (and
+DS1820), DS18B20, DS1822, the DS2438 Smart Battery Monitor, DS2422 and DS2423
+Counters, DS2409 MicroLAN Coupler (used in 1-wire hubs), and the AAG TAI-8540
+humidity sensor.
+ </longdescription>
+ <use>
+ <flag name="ds2490">Build support for the ds2490 sensor</flag>
+ <flag name="ds9097">Build support for the ds9097 sensor</flag>
+ <flag name="ds9097u">Build support for the ds9097u sensor</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">bcl/digitemp</remote-id>
+ </upstream>
+</pkgmetadata>
+
diff --git a/app-misc/dnetc-2.9107.516 b/app-misc/dnetc-2.9107.516
deleted file mode 100644
index 0a0c290516c5..000000000000
--- a/app-misc/dnetc-2.9107.516
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=distributed.net client
-EAPI=2
-HOMEPAGE=http://www.distributed.net
-KEYWORDS=~sparc
-LICENSE=distributed.net GPL-2
-RDEPEND=net-dns/bind-tools
-RESTRICT=mirror
-SLOT=0
-SRC_URI=sparc? ( http://http.distributed.net/pub/dcti/v2.9107/dnetc516-linux-sparc-v7.tar.gz )
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=5a82ea50be1170c5914e0f60892f1f90
diff --git a/app-misc/dnetc-2.9108.517 b/app-misc/dnetc-2.9108.517
deleted file mode 100644
index 86fed2a10220..000000000000
--- a/app-misc/dnetc-2.9108.517
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=distributed.net client
-EAPI=2
-HOMEPAGE=http://www.distributed.net
-KEYWORDS=amd64 x86
-LICENSE=distributed.net GPL-2
-RDEPEND=net-dns/bind-tools
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://http.distributed.net/pub/dcti/v2.9108/dnetc517-linux-amd64.tar.gz ) x86? ( http://http.distributed.net/pub/dcti/v2.9108/dnetc517-linux-x86-elf-uclibc.tar.gz )
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=e56d6ad90f3bda87fc81463f17dcbcb7
diff --git a/app-misc/dnetc-2.9109.518 b/app-misc/dnetc-2.9109.518
deleted file mode 100644
index 821a77dbaa26..000000000000
--- a/app-misc/dnetc-2.9109.518
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=distributed.net client
-EAPI=2
-HOMEPAGE=http://www.distributed.net
-KEYWORDS=~amd64 ~ppc
-LICENSE=distributed.net GPL-2
-RDEPEND=net-dns/bind-tools
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://http.distributed.net/pub/dcti/v2.9109/dnetc518-linux-amd64.tar.gz ) ppc? ( http://http.distributed.net/pub/dcti/v2.9109/dnetc518-linux-ppc-uclibc.tar.gz )
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=13943035d88731dd6733082125814463
diff --git a/app-misc/dnetc-2.9110.519 b/app-misc/dnetc-2.9110.519
deleted file mode 100644
index 2cd427e9fd02..000000000000
--- a/app-misc/dnetc-2.9110.519
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=distributed.net client
-EAPI=2
-HOMEPAGE=http://www.distributed.net
-KEYWORDS=~x86
-LICENSE=distributed.net GPL-2
-RDEPEND=net-dns/bind-tools
-RESTRICT=mirror
-SLOT=0
-SRC_URI=x86? ( http://http.distributed.net/pub/dcti/v2.9110/dnetc519-linux-x86-elf-uclibc.tar.gz )
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=90ea5fa196358de5239b022c1c8a77df
diff --git a/app-misc/dnetc-2.9110.519b b/app-misc/dnetc-2.9110.519b
deleted file mode 100644
index 5bf50014ec77..000000000000
--- a/app-misc/dnetc-2.9110.519b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=distributed.net client
-EAPI=2
-HOMEPAGE=http://www.distributed.net
-KEYWORDS=~amd64
-LICENSE=distributed.net GPL-2
-RDEPEND=net-dns/bind-tools
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://http.distributed.net/pub/dcti/v2.9110/dnetc519b-linux-amd64.tar.gz )
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=fefb251016117eaf407950aa89909947
diff --git a/app-misc/dnetc/Manifest b/app-misc/dnetc/Manifest
new file mode 100644
index 000000000000..f88f0cecd08b
--- /dev/null
+++ b/app-misc/dnetc/Manifest
@@ -0,0 +1,15 @@
+AUX dnetc.confd 403 BLAKE2B e33eef2035a74a459202842a84164be35995232049ab8d1d2e47fb379dfe74f89597d7fdb15431e4953842a2b03dcd45e6b4354551509561d7d7ab43813fe128 SHA512 c088d9d02d55e3c99b3d6095487e061804bca1c571637d46a4234253d0ef8efe3ed22c93db2c48ad2e70223c96a3307c825d94114d87609bc764503b4f95e5ef
+AUX dnetc.initd 2013 BLAKE2B 2da278fa7d03c7d23a9a64f218f911c4eddb9141519b488dae5d8f2123136f9d328fbcf2ff9fe61cdccb53c940f38b389b81911fe108d7a58d77b58f09f147aa SHA512 c3f23a7913331c318042517a517e29679a585bbf92f4da91aada528cbfe60f068959b2b7804658b14597734ddea23c6f2881cd8a150be8f5d4bf69c873214d29
+DIST dnetc516-linux-sparc-v7.tar.gz 881743 BLAKE2B 7c2c4a258e1c82dd9a1f4d6271df3b4ee46eaafc765bf7c054a53ddc9625f64dcdfcd86a51285f81ccf343a6086cc9ff404fccd0cd9c8fea2554d69fe17f618e SHA512 d70410773a14fe7237e0c542f45ab69f840dfd484622923da3abf723ffacf82bf94ecaa1d2089ab9326121ed4b3562ace7b267ed57bbf2c0971793b25fd30958
+DIST dnetc517-linux-amd64.tar.gz 645416 BLAKE2B a6181c82e7bdb8995930b3c93c88dd588f707ea6429e4f7f27961928129423be571f0c63e7aa5d5d9a8e5e3687a8bd54e6dc6835f5317273aa3f99ee863e8320 SHA512 b22b59af2352a95156ea4b584f48d82e4b64080130d922bbb1797b2c62f7c401ec1263f2f0bd57103134f8fc76ef41a7e09d7da083ef0b46c44be4239005c21b
+DIST dnetc517-linux-x86-elf-uclibc.tar.gz 676398 BLAKE2B 9edfa3f11b837841b362dd81bdd9a39882b6bd45942f11f6c8ebde4966351a0ea4c003eb27a36c2fe187034571d48a5d851d5931dc6121196f2097a22f9a1c30 SHA512 7b56fa8c6819fd7060612c13c8fb17ca1e949abbca965b7599bb072751acd1d0e95f1a90fb67172c6d406b54e0c52549582489802e538670bdb6d12f8354e2a7
+DIST dnetc518-linux-amd64.tar.gz 644073 BLAKE2B 6e33120d54fab253ceee8d26ea1eb266ea10f69383a7735637ca9e905e98f51cd0052904bb695a6989a5a3b8996d6cad8d2b6807bbd88d7abedcdef8566a39d3 SHA512 95ad5144fbb1356806f6fd6f499891b36a0ea7c75794ada40cba9146c830adfd20044d8d3f3689186c9317b477aa95a6aae5d711c19534059b06b5d33367d785
+DIST dnetc518-linux-ppc-uclibc.tar.gz 717889 BLAKE2B afc3cfaa3700c03379a10fe72c5939f09ee4bdfb3dd4ea55195ec31a85d1a5797a99abe15acfcb87c081166b6c311913be33f2105f39e212e5fb2060685ad34e SHA512 c0d7592b1a5c98001355e71a1d31bc67bfef6b4c5f73c8e200717424ae4ea5c62558c413753e079f4e0b6bacdb921b395f46c168673e82049dcb69a0512d11eb
+DIST dnetc519-linux-x86-elf-uclibc.tar.gz 676925 BLAKE2B f6a5d9bc1a7f1608079a9212c38a1b2854919ce3c0c9c3423c4f42f09976d90c418de966ba8ec86d1ddd1cfac4e40cf090e898297ac1146d2e9efc93bcd17e32 SHA512 87519867e8e993d7b6520d73133196d34391d0694d8d8bbc372bac4e0b21ceb1a22fcd000bd2f29841695ee7232c4584eb1b19a690f723320df023c52a581395
+DIST dnetc519b-linux-amd64.tar.gz 648333 BLAKE2B 54d787d5e9a98563bba1a0cc62f70900f0fa39becf6f48a66ae888e0ce0f1f2c64a79fc6c6b3fae724ed244e3f0286dc0f266332d851347b982bffcd1807696f SHA512 ea7899772ee8c5fbfbe96b6ec69b1a3237fe5ae96b17bb7e11e387fb833b471f3cce8809cf3c9987dfe33c7ca7082db560c36898094ace3e547077b7a5afc324
+EBUILD dnetc-2.9107.516.ebuild 2690 BLAKE2B 1d0864fcb4bc8c6d2e15bbb2521ecb4b6e7ce554f8253e012338de46b827e940518252cf1e4f2325b4d261f230c671930c84af93295041357835c8c4c5511ce7 SHA512 c052c46f1aa734c8ac3a0dc92326e7c9ba6171b82c8e874c253515477066ee0ddbc2145497fb2dd56992affa4afdcfc6c5f4c83fed8c8c78cee1649d044bafa3
+EBUILD dnetc-2.9108.517.ebuild 2682 BLAKE2B cf6f8b44cebb407442779860387614e2ec2616ab8239e1abd30e82868820a93d9ed7887204451d5735af313f004716740cd71503de50d14aa94af66a3abb0c51 SHA512 7134f249034c68baaca4f2cc9987de67faa938c3cbdea5bd969d7ec98dec9404c775832445cbf6b1febec356c5ce08bd284100902abbccd821d6bc1fedd04f25
+EBUILD dnetc-2.9109.518.ebuild 2684 BLAKE2B e846b3ec49427492731eb9af765c8098ae396301f76eb3836ec549a1737b1f59a647c13c550c712eb8ca9b3c0fd0d9e2bdad57705800c89d7af6e7f0316eee7e SHA512 8e9936bb3bca2fb51e6671984861d58aa7d1998251f25245239aec14d36be71df2d973c9109a5bb5ac5ba8adb7d024b7bffb49e63069ff2ab5b265cf9b03d13b
+EBUILD dnetc-2.9110.519.ebuild 2684 BLAKE2B d44e8e92cae09536f8cbc69d5e308d436555677b30445dcb4404db9184bec4695f8e43a3706110bfdbcee44cecc0335ee356d777f062a9fca04033b79c694e16 SHA512 c267a5f62af380e4b6e8f9515d8b4fa046fffc5302fb6d47dc850bef3a882bd458416058b548ed867f4a6c4b811181293bd4c058fa0a20cdc8ca619982021567
+EBUILD dnetc-2.9110.519b.ebuild 2651 BLAKE2B 476920e8f442f3f14d813a335655c913c603700d3599cf6e9270c356b5168514b46063dfcfbd30dabe0dc552917fb35b5c4335719232a30f8779f2e72c85b858 SHA512 3c1a3120dd66cdabc6e41951e8fb6721449c094aa60448d151eacd20f440eb769f11faed0e724dc1b95d6629656d809b40949e85c0db8ff5bc003f8b5c5e6ade
+MISC metadata.xml 357 BLAKE2B 10b84b6b4353d0dae2f48deae6622ca345c7723641b97ddd5e58e7ce7bbe438a065f3ac528a946bd99e089a45a8c2274417a51b05170d116a3fbd6e4bbb921a2 SHA512 6986582029e81ab7b8eec22c707c03c1996d0837ca9b4e7a0c31782be3f9c59a7d89c53980fdac00bb2a49555a774933704ac3fe390785840d072ac7ac9ac33d
diff --git a/app-misc/dnetc/dnetc-2.9107.516.ebuild b/app-misc/dnetc/dnetc-2.9107.516.ebuild
new file mode 100644
index 000000000000..bebbc0923b3b
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9107.516.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit user
+
+MAJ_PV=${PV:0:6}
+MIN_PV=${PV:7:9}
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+#SRC_URI_x86="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+#SRC_URI_amd64="amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64.tar.gz )"
+#SRC_URI_ppc="ppc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-ppc-uclibc.tar.gz )"
+SRC_URI_sparc="sparc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-sparc-v7.tar.gz )"
+SRC_URI="${SRC_URI_amd64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_URI_sparc}"
+
+LICENSE="distributed.net GPL-2"
+SLOT="0"
+KEYWORDS="~sparc" # x86,amd64,ppc not available for this version
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="net-dns/bind-tools"
+
+QA_PRESTRIPPED="opt/distributed.net/dnetc"
+
+S=${WORKDIR}/dnetc
+
+src_prepare() {
+ binname=""
+ if use amd64; then
+ binname=dnetc${MIN_PV}-linux-amd64
+ elif use x86; then
+ binname=dnetc${MIN_PV}-linux-x86-elf-uclibc
+ elif use ppc; then
+ binname=dnetc${MIN_PV}-linux-ppc-elf-uclibc
+ fi
+ [[ -z "${binname}" ]] && die "Name of dnetc binary for this platform undefined"
+ mv "${binname}" dnetc || die "$binname binary is missing"
+}
+
+src_install() {
+ exeinto /opt/distributed.net
+ doexe dnetc
+
+ doman dnetc.1
+ dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+ newinitd "${FILESDIR}"/dnetc.initd dnetc
+ newconfd "${FILESDIR}"/dnetc.confd dnetc
+
+ keepdir /var/spool/dnetc
+}
+
+pkg_preinst() {
+ if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+ einfo "flushing old buffers"
+ source /etc/conf.d/dnetc
+
+ if [ -e /opt/distributed.net/dnetc.ini ]; then
+ # use ini file
+ /opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
+ elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
+ # email adress from config
+ /opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
+ fi
+
+ einfo "removing old buffer files"
+ rm -f /opt/distributed.net/buff*
+ fi
+
+ enewgroup dnetc
+ enewuser dnetc -1 -1 /opt/distributed.net dnetc
+}
+
+pkg_postinst() {
+ chown -Rf dnetc:dnetc /opt/distributed.net
+ chmod 0555 /opt/distributed.net/dnetc
+
+ elog "To run distributed.net client in the background at boot:"
+ elog " rc-update add dnetc default"
+ elog ""
+ elog "Either configure your email address in /etc/conf.d/dnetc"
+ elog "or create the configuration file /opt/distributed.net/dnetc.ini"
+}
+
+pkg_postrm() {
+ if [ -d /opt/distributed.net ]; then
+ elog "All files has not been removed from /opt/distributed.net"
+ fi
+}
diff --git a/app-misc/dnetc/dnetc-2.9108.517.ebuild b/app-misc/dnetc/dnetc-2.9108.517.ebuild
new file mode 100644
index 000000000000..b8ef427428da
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9108.517.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit user
+
+MAJ_PV=${PV:0:6}
+MIN_PV=${PV:7:9}
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+SRC_URI_x86="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+SRC_URI_amd64="amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64.tar.gz )"
+#SRC_URI_ppc="ppc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-ppc-uclibc.tar.gz )"
+#SRC_URI_sparc="sparc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-sparc-v7.tar.gz )"
+SRC_URI="${SRC_URI_amd64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_URI_sparc}"
+
+LICENSE="distributed.net GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86" # ppc not available for this version
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="net-dns/bind-tools"
+
+QA_PRESTRIPPED="opt/distributed.net/dnetc"
+
+S=${WORKDIR}/dnetc
+
+src_prepare() {
+ binname=""
+ if use amd64; then
+ binname=dnetc${MIN_PV}-linux-amd64
+ elif use x86; then
+ binname=dnetc${MIN_PV}-linux-x86-elf-uclibc
+ elif use ppc; then
+ binname=dnetc${MIN_PV}-linux-ppc-elf-uclibc
+ fi
+ [[ -z "${binname}" ]] && die "Name of dnetc binary for this platform undefined"
+ mv "${binname}" dnetc || die "$binname binary is missing"
+}
+
+src_install() {
+ exeinto /opt/distributed.net
+ doexe dnetc
+
+ doman dnetc.1
+ dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+ newinitd "${FILESDIR}"/dnetc.initd dnetc
+ newconfd "${FILESDIR}"/dnetc.confd dnetc
+
+ keepdir /var/spool/dnetc
+}
+
+pkg_preinst() {
+ if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+ einfo "flushing old buffers"
+ source /etc/conf.d/dnetc
+
+ if [ -e /opt/distributed.net/dnetc.ini ]; then
+ # use ini file
+ /opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
+ elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
+ # email adress from config
+ /opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
+ fi
+
+ einfo "removing old buffer files"
+ rm -f /opt/distributed.net/buff*
+ fi
+
+ enewgroup dnetc
+ enewuser dnetc -1 -1 /opt/distributed.net dnetc
+}
+
+pkg_postinst() {
+ chown -Rf dnetc:dnetc /opt/distributed.net
+ chmod 0555 /opt/distributed.net/dnetc
+
+ elog "To run distributed.net client in the background at boot:"
+ elog " rc-update add dnetc default"
+ elog ""
+ elog "Either configure your email address in /etc/conf.d/dnetc"
+ elog "or create the configuration file /opt/distributed.net/dnetc.ini"
+}
+
+pkg_postrm() {
+ if [ -d /opt/distributed.net ]; then
+ elog "All files has not been removed from /opt/distributed.net"
+ fi
+}
diff --git a/app-misc/dnetc/dnetc-2.9109.518.ebuild b/app-misc/dnetc/dnetc-2.9109.518.ebuild
new file mode 100644
index 000000000000..071accd0bdd1
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9109.518.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit user
+
+MAJ_PV=${PV:0:6}
+MIN_PV=${PV:7:9}
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+#SRC_URI_x86="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+SRC_URI_amd64="amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64.tar.gz )"
+SRC_URI_ppc="ppc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-ppc-uclibc.tar.gz )"
+#SRC_URI_sparc="sparc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-sparc-v7.tar.gz )"
+SRC_URI="${SRC_URI_amd64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_URI_sparc}"
+
+LICENSE="distributed.net GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc" # x86 not available for this version
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="net-dns/bind-tools"
+
+QA_PRESTRIPPED="opt/distributed.net/dnetc"
+
+S=${WORKDIR}/dnetc
+
+src_prepare() {
+ binname=""
+ if use amd64; then
+ binname=dnetc${MIN_PV}-linux-amd64
+ elif use x86; then
+ binname=dnetc${MIN_PV}-linux-x86-elf-uclibc
+ elif use ppc; then
+ binname=dnetc${MIN_PV}-linux-ppc-elf-uclibc
+ fi
+ [[ -z "${binname}" ]] && die "Name of dnetc binary for this platform undefined"
+ mv "${binname}" dnetc || die "$binname binary is missing"
+}
+
+src_install() {
+ exeinto /opt/distributed.net
+ doexe dnetc
+
+ doman dnetc.1
+ dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+ newinitd "${FILESDIR}"/dnetc.initd dnetc
+ newconfd "${FILESDIR}"/dnetc.confd dnetc
+
+ keepdir /var/spool/dnetc
+}
+
+pkg_preinst() {
+ if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+ einfo "flushing old buffers"
+ source /etc/conf.d/dnetc
+
+ if [ -e /opt/distributed.net/dnetc.ini ]; then
+ # use ini file
+ /opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
+ elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
+ # email adress from config
+ /opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
+ fi
+
+ einfo "removing old buffer files"
+ rm -f /opt/distributed.net/buff*
+ fi
+
+ enewgroup dnetc
+ enewuser dnetc -1 -1 /opt/distributed.net dnetc
+}
+
+pkg_postinst() {
+ chown -Rf dnetc:dnetc /opt/distributed.net
+ chmod 0555 /opt/distributed.net/dnetc
+
+ elog "To run distributed.net client in the background at boot:"
+ elog " rc-update add dnetc default"
+ elog ""
+ elog "Either configure your email address in /etc/conf.d/dnetc"
+ elog "or create the configuration file /opt/distributed.net/dnetc.ini"
+}
+
+pkg_postrm() {
+ if [ -d /opt/distributed.net ]; then
+ elog "All files has not been removed from /opt/distributed.net"
+ fi
+}
diff --git a/app-misc/dnetc/dnetc-2.9110.519.ebuild b/app-misc/dnetc/dnetc-2.9110.519.ebuild
new file mode 100644
index 000000000000..3785ad20a0bd
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9110.519.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit user
+
+MAJ_PV=${PV:0:6}
+MIN_PV=${PV:7:9}
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+SRC_URI_x86="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+#SRC_URI_amd64="amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64.tar.gz )"
+#SRC_URI_ppc="ppc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-ppc-uclibc.tar.gz )"
+#SRC_URI_sparc="sparc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-sparc-v7.tar.gz )"
+SRC_URI="${SRC_URI_amd64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_URI_sparc}"
+
+LICENSE="distributed.net GPL-2"
+SLOT="0"
+KEYWORDS="~x86" # ppc,amd64 not available for this version
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="net-dns/bind-tools"
+
+QA_PRESTRIPPED="opt/distributed.net/dnetc"
+
+S=${WORKDIR}/dnetc
+
+src_prepare() {
+ binname=""
+ if use amd64; then
+ binname=dnetc${MIN_PV}-linux-amd64
+ elif use x86; then
+ binname=dnetc${MIN_PV}-linux-x86-elf-uclibc
+ elif use ppc; then
+ binname=dnetc${MIN_PV}-linux-ppc-elf-uclibc
+ fi
+ [[ -z "${binname}" ]] && die "Name of dnetc binary for this platform undefined"
+ mv "${binname}" dnetc || die "$binname binary is missing"
+}
+
+src_install() {
+ exeinto /opt/distributed.net
+ doexe dnetc
+
+ doman dnetc.1
+ dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+ newinitd "${FILESDIR}"/dnetc.initd dnetc
+ newconfd "${FILESDIR}"/dnetc.confd dnetc
+
+ keepdir /var/spool/dnetc
+}
+
+pkg_preinst() {
+ if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+ einfo "flushing old buffers"
+ source /etc/conf.d/dnetc
+
+ if [ -e /opt/distributed.net/dnetc.ini ]; then
+ # use ini file
+ /opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
+ elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
+ # email adress from config
+ /opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
+ fi
+
+ einfo "removing old buffer files"
+ rm -f /opt/distributed.net/buff*
+ fi
+
+ enewgroup dnetc
+ enewuser dnetc -1 -1 /opt/distributed.net dnetc
+}
+
+pkg_postinst() {
+ chown -Rf dnetc:dnetc /opt/distributed.net
+ chmod 0555 /opt/distributed.net/dnetc
+
+ elog "To run distributed.net client in the background at boot:"
+ elog " rc-update add dnetc default"
+ elog ""
+ elog "Either configure your email address in /etc/conf.d/dnetc"
+ elog "or create the configuration file /opt/distributed.net/dnetc.ini"
+}
+
+pkg_postrm() {
+ if [ -d /opt/distributed.net ]; then
+ elog "All files has not been removed from /opt/distributed.net"
+ fi
+}
diff --git a/app-misc/dnetc/dnetc-2.9110.519b.ebuild b/app-misc/dnetc/dnetc-2.9110.519b.ebuild
new file mode 100644
index 000000000000..59faa0435084
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9110.519b.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit user
+
+MAJ_PV=${PV:0:6}
+MIN_PV=${PV:7:9}
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+#SRC_URI_x86="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+SRC_URI_amd64="amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64.tar.gz )"
+#SRC_URI_ppc="ppc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-ppc-uclibc.tar.gz )"
+#SRC_URI_sparc="sparc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-sparc-v7.tar.gz )"
+SRC_URI="${SRC_URI_amd64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_URI_sparc}"
+
+LICENSE="distributed.net GPL-2"
+SLOT="0"
+KEYWORDS="~amd64" # ppc,x86 not available for this version
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="net-dns/bind-tools"
+
+QA_PREBUILT="opt/distributed.net/dnetc"
+
+getS() {
+ case $ARCH in
+ amd64) suffix=amd64 ;;
+ x86) suffix=x86-elf-uclibc ;;
+ ppc) suffix=ppc-elf-uclibc ;;
+ esac
+ echo dnetc${MIN_PV:0:3}-linux-${suffix}
+}
+
+src_prepare() {
+ export S="${WORKDIR}/$(getS)"
+ cd "${S}"
+ [[ -x dnetc ]] || die "Name of dnetc directory/binary for this platform undefined"
+}
+
+src_install() {
+ export S="${WORKDIR}/$(getS)"
+ cd "${S}"
+ exeinto /opt/distributed.net
+ doexe dnetc
+
+ doman dnetc.1
+ dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+ newinitd "${FILESDIR}"/dnetc.initd dnetc
+ newconfd "${FILESDIR}"/dnetc.confd dnetc
+
+ keepdir /var/spool/dnetc
+}
+
+pkg_preinst() {
+ if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+ einfo "flushing old buffers"
+ source /etc/conf.d/dnetc
+
+ if [ -e /opt/distributed.net/dnetc.ini ]; then
+ # use ini file
+ /opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
+ elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
+ # email adress from config
+ /opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
+ fi
+
+ einfo "removing old buffer files"
+ rm -f /opt/distributed.net/buff*
+ fi
+
+ enewgroup dnetc
+ enewuser dnetc -1 -1 /opt/distributed.net dnetc
+}
+
+pkg_postinst() {
+ chown -Rf dnetc:dnetc /opt/distributed.net
+ chmod 0555 /opt/distributed.net/dnetc
+
+ elog "To run distributed.net client in the background at boot:"
+ elog " rc-update add dnetc default"
+ elog ""
+ elog "Either configure your email address in /etc/conf.d/dnetc"
+ elog "or create the configuration file /opt/distributed.net/dnetc.ini"
+}
+
+pkg_postrm() {
+ if [ -d /opt/distributed.net ]; then
+ elog "All files has not been removed from /opt/distributed.net"
+ fi
+}
diff --git a/app-misc/dnetc/files/dnetc.confd b/app-misc/dnetc/files/dnetc.confd
new file mode 100644
index 000000000000..f6f0da6b7e2d
--- /dev/null
+++ b/app-misc/dnetc/files/dnetc.confd
@@ -0,0 +1,18 @@
+# configuration file for dnetc
+
+# Startup will look for configuration files in the following places, using the
+# first one that it finds:
+# 1. /etc/dnetc.conf
+# 2. /opt/distributed.net/dnetc.ini
+
+# Values specified here will override those found in any client configuration
+# file.
+
+# email adress
+EMAIL=
+
+# buffer base dir
+BUFFER_BASE_DIR=/var/spool/dnetc
+
+# keyserver address
+KEYSERVER_ADDRESS=
diff --git a/app-misc/dnetc/files/dnetc.initd b/app-misc/dnetc/files/dnetc.initd
new file mode 100644
index 000000000000..f3a512074912
--- /dev/null
+++ b/app-misc/dnetc/files/dnetc.initd
@@ -0,0 +1,88 @@
+#!/sbin/openrc-run
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="${opts} reload fetch flush"
+
+depend() {
+ use net
+}
+
+processOpts() {
+ local retVal=1
+
+ DNETPATH="/opt/distributed.net"
+ DNETBIN="${DNETPATH}/dnetc"
+
+ STARTOPTS="--start --chuid dnetc:dnetc --quiet \
+ --exec ${DNETBIN}"
+
+ DNETOPTS="-quiet"
+
+ if [ -e /etc/dnetc.ini ] ; then
+ retVal=0
+ DNETOPTS="${DNETOPTS} -ini /etc/dnetc.ini"
+ elif [ -e ${DNETPATH}/dnetc.ini ]; then
+ retVal=0
+ DNETOPTS="${DNETOPTS} -ini ${DNETPATH}/dnetc.ini"
+ elif [ ! -z ${EMAIL} ]; then
+ retVal=0
+ fi
+
+ # override ini settings with values in /etc/conf.d/dnetc
+
+ DNETOPTS="${DNETOPTS} ${EMAIL:+-e ${EMAIL}}"
+ if [ ! -z ${BUFFER_BASE_DIR} ] ; then
+ local buff_in="${BUFFER_BASE_DIR:+${BUFFER_BASE_DIR}/}buff-in"
+ local buff_out="${BUFFER_BASE_DIR:+${BUFFER_BASE_DIR}/}buff-out"
+ DNETOPTS="${DNETOPTS} -inbase ${buff_in}"
+ DNETOPTS="${DNETOPTS} -outbase ${buff_out}"
+ fi
+ DNETOPTS="${DNETOPTS} ${KEYSERVER_ADDRESS:+-a ${KEYSERVER_ADDRESS}}"
+
+ # fair group cpu scheduler
+ uidpath="/sys/kernel/uids/`id -u dnetc`"
+ [ -d $uidpath ] && echo 2 >$uidpath/cpu_share
+ unset uidpath
+
+ if [ ${retVal} -ne 0 ] ; then
+ eerror "Need some sort of configuration. Check /etc/conf.d/dnetc."
+ fi
+
+ return ${retVal}
+}
+
+start() {
+ processOpts || return 1
+ ebegin "Starting distributed.net client"
+ start-stop-daemon ${STARTOPTS} -- ${DNETOPTS}
+ eend ${?}
+}
+
+stop() {
+ processOpts || return 1
+ ebegin "Stopping distributed.net client"
+ start-stop-daemon --stop --quiet --exec ${DNETBIN} --
+ eend ${?}
+}
+
+reload() {
+ processOpts || return 1
+ ebegin "Reloading distributed.net client"
+ start-stop-daemon --stop --quiet --signal HUP --exec ${DNETBIN}
+ eend ${?}
+}
+
+fetch() {
+ processOpts || return 1
+ ebegin "Fetching distributed.net client buffers"
+ ${DNETBIN} ${DNETOPTS} -fetch
+ eend ${?}
+}
+
+flush() {
+ processOpts || return 1
+ ebegin "Flushing distributed.net client buffers"
+ ${DNETBIN} ${DNETOPTS} -flush
+ eend ${?}
+}
diff --git a/app-misc/dnetc/metadata.xml b/app-misc/dnetc/metadata.xml
new file mode 100644
index 000000000000..40c9f16e0287
--- /dev/null
+++ b/app-misc/dnetc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <longdescription>
+ a distributed client for the distributed.net cracking challenges.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/dtach-0.8-r1 b/app-misc/dtach-0.8-r1
deleted file mode 100644
index d2e8bc8282c1..000000000000
--- a/app-misc/dtach-0.8-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Emulates the detach feature of screen
-EAPI=4
-HOMEPAGE=http://dtach.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/dtach/dtach-0.8.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c1a2b71a4c74ba9b2f1c3e5b1ec6582
diff --git a/app-misc/dtach-0.9 b/app-misc/dtach-0.9
deleted file mode 100644
index 5f129c7c3e5f..000000000000
--- a/app-misc/dtach-0.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Emulates the detach feature of screen
-EAPI=6
-HOMEPAGE=http://dtach.sourceforge.net/ https://github.com/crigler/dtach
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/dtach/dtach-0.9.tar.gz
-_md5_=11abbf905984f227d4e791b84a601726
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
new file mode 100644
index 000000000000..6c574490b687
--- /dev/null
+++ b/app-misc/dtach/Manifest
@@ -0,0 +1,6 @@
+AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a3680077fc5baf1c55e0298bc772a4987efe2723a01d0f8b3a295173c8fe92c5d066993f9946b6b4beae80cc2de8aaebae8 SHA512 64ab0e8384e4f04e43b8565440b0ec3f0d43b87e142cd15dda0eec2b320aa3e8ed437524dcdbd390b83f4cb39c13df3575318be4de5f8eec50fb710c9ec1170b
+DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
+DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
+EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
+EBUILD dtach-0.9.ebuild 464 BLAKE2B 05f6f7540c4859d50d54bb2b12b215c75393d0f3e15c91e7a47abcf9d835c9d5b84bf373fab0200e2ae81f0fa610f89441a5555514c9f4bf5d0bde5130e2444b SHA512 934755b47e1835affcbd1d5f92545b42ea6f315ed810d397ae069fa69aef9f4a5abd99e4a1ef92528db86ebcd2aad7c04462093813b4af5fcd940b38020c1759
+MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.8-r1.ebuild b/app-misc/dtach/dtach-0.8-r1.ebuild
new file mode 100644
index 000000000000..34e56870b850
--- /dev/null
+++ b/app-misc/dtach/dtach-0.8-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Emulates the detach feature of screen"
+HOMEPAGE="http://dtach.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-CVE-2012-3368.patch
+}
+
+src_install() {
+ dobin dtach
+ doman dtach.1
+ dodoc README
+}
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
new file mode 100644
index 000000000000..9f494f43e668
--- /dev/null
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Emulates the detach feature of screen"
+HOMEPAGE="http://dtach.sourceforge.net/ https://github.com/crigler/dtach"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
+IUSE=""
+
+src_install() {
+ dobin dtach
+ doman dtach.1
+ dodoc README
+}
diff --git a/app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch b/app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch
new file mode 100644
index 000000000000..82d5f0e1e159
--- /dev/null
+++ b/app-misc/dtach/files/dtach-0.8-CVE-2012-3368.patch
@@ -0,0 +1,35 @@
+Fix error handling for read from stdin in attach.c
+
+attach.c did not correctly handle a read from stdin when read returned
+an error. The code assigned the return value of read to pkt.len (an
+unsigned char) before checking the value. This prevented the error check
+from working correctly, since an unsigned integer can never be < 0.
+
+A packet with an invalid length was then sent to the master, which then
+sent 255 bytes of garbage to the program.
+
+Fix the bug in attach.c and the unchecked packet length bug in master.c.
+
+Report and initial patch by Enrico Scholz.
+
+--- attach.c 2012/07/01 21:26:10 1.12
++++ attach.c 2012/07/01 21:44:34 1.13
+@@ -237,12 +237,16 @@
+ /* stdin activity */
+ if (n > 0 && FD_ISSET(0, &readfds))
+ {
++ ssize_t len;
++
+ pkt.type = MSG_PUSH;
+ memset(pkt.u.buf, 0, sizeof(pkt.u.buf));
+- pkt.len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
++ len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
+
+- if (pkt.len <= 0)
++ if (len <= 0)
+ exit(1);
++
++ pkt.len = len;
+ process_kbd(s, &pkt);
+ n--;
+ }
diff --git a/app-misc/dtach/metadata.xml b/app-misc/dtach/metadata.xml
new file mode 100644
index 000000000000..b49e8d43f1e8
--- /dev/null
+++ b/app-misc/dtach/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">dtach</remote-id>
+ <remote-id type="github">crigler/dtach</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/dvorak7min-1.6.1 b/app-misc/dvorak7min-1.6.1
deleted file mode 100644
index 485fa10ab815..000000000000
--- a/app-misc/dvorak7min-1.6.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Simple ncurses-based typing tutor for learning the Dvorak keyboard layout
-EAPI=4
-HOMEPAGE=http://www.linalco.com/comunidad.html
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.linalco.com/ragnar/dvorak7min-1.6.1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5e15658685f621796367cc3afdd68e90
diff --git a/app-misc/dvorak7min/Manifest b/app-misc/dvorak7min/Manifest
new file mode 100644
index 000000000000..edaf82c08404
--- /dev/null
+++ b/app-misc/dvorak7min/Manifest
@@ -0,0 +1,3 @@
+DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a
+EBUILD dvorak7min-1.6.1.ebuild 605 BLAKE2B d18c30969fbd3d1fb15ebd7c77867ed7f33d6cc01b2452a80f50efdf8bd57751700d99940b19e81e78ea3281ee7084c34bc6c43ec8af8910ae1ef28fb6060d53 SHA512 84a1760af7ea02ef465350dbe74d5960f76f5f7d1d301979c41463fff3096aecd2577dcdc70545618efdaef554c84daae1aa54b139d9a517b6edb69a2a192d98
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild
new file mode 100644
index 000000000000..64c731780400
--- /dev/null
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple ncurses-based typing tutor for learning the Dvorak keyboard layout"
+HOMEPAGE="http://www.linalco.com/comunidad.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_prepare() {
+ emake clean
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ PROF="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc ChangeLog README
+}
diff --git a/app-misc/dvorak7min/metadata.xml b/app-misc/dvorak7min/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/dvorak7min/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/dvorakng-0.6.0 b/app-misc/dvorakng-0.6.0
deleted file mode 100644
index 26297c72ee57..000000000000
--- a/app-misc/dvorakng-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:* virtual/pkgconfig
-DESCRIPTION=Dvorak typing tutor
-EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/dvorakng/?topic_id=71%2C861
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:*
-SLOT=0
-SRC_URI=http://www.free.of.pl/n/nopik/dvorakng-0.6.0rc1.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c2e5f98378a56e2f467b7b701c506f62
diff --git a/app-misc/dvorakng/Manifest b/app-misc/dvorakng/Manifest
new file mode 100644
index 000000000000..7c4991a60ce9
--- /dev/null
+++ b/app-misc/dvorakng/Manifest
@@ -0,0 +1,3 @@
+DIST dvorakng-0.6.0rc1.tar.bz2 28994 BLAKE2B 587222f6d3e65427ba3cb28c5ccce976363638dbe611382af9345e542387f42e855aa5a2b578abe451b719663780af214b02d087d1add3ec8574af8d8e207112 SHA512 87f0bb2199188093ea4223d7dc47232f53b266aa9498170b643c25e724f547fa1ce5d0e1d4e7f275c712f6ec4850d825827b66f84407f186eb80b73ac973ded7
+EBUILD dvorakng-0.6.0.ebuild 653 BLAKE2B e5b03a6c0e2c780e2957eca1ac6c25474ad8a54eca70cd412c055b8215e1243f322000b5052ffeb1f28e62e41439ac4a9a8963a3682c9abffcc575f71402d513 SHA512 cf8e588e09d8e2e0232eba7f24183a0fe03f7f961cc38d68778ec74ec101f29818749130a8dead61d20f0a8c6ad8e0ab1842bbc5935b6dfcfbb60aa2ccbbec7d
+MISC metadata.xml 243 BLAKE2B 623b180d7b402dc151662caa705460fe911c88b6330c7f8610b401c093fccbe88429a1464247d40eb4756ef14e30b626fcf7a7fafe887ab029f2523288e3c049 SHA512 0c6d3c4fec9011d1fb2db62b4acd032700b92ace835ef852dcab0acabcac02cd155aa002020432329b972be82159606072244b1421d2d80da09c919e952f1c41
diff --git a/app-misc/dvorakng/dvorakng-0.6.0.ebuild b/app-misc/dvorakng/dvorakng-0.6.0.ebuild
new file mode 100644
index 000000000000..b99e9273b654
--- /dev/null
+++ b/app-misc/dvorakng/dvorakng-0.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Dvorak typing tutor"
+HOMEPAGE="http://freshmeat.net/projects/dvorakng/?topic_id=71%2C861"
+SRC_URI="http://www.free.of.pl/n/nopik/${P}rc1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+RDEPEND="
+ sys-libs/ncurses:*
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+ emake \
+ CXX="$(tc-getCXX)" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README TODO
+}
diff --git a/app-misc/dvorakng/metadata.xml b/app-misc/dvorakng/metadata.xml
new file mode 100644
index 000000000000..0cd94576171d
--- /dev/null
+++ b/app-misc/dvorakng/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="freshmeat">dvorakng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/dvtm-0.14-r1 b/app-misc/dvtm-0.14-r1
deleted file mode 100644
index 54d10021c7df..000000000000
--- a/app-misc/dvtm-0.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode?]
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=5
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
-IUSE=unicode savedconfig
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode?] !>=sys-libs/ncurses-6.1
-SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.14.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6b18fe2a247e3dfb46cf9d4ccaff1bd3
diff --git a/app-misc/dvtm-0.15-r2 b/app-misc/dvtm-0.15-r2
deleted file mode 100644
index de2736792536..000000000000
--- a/app-misc/dvtm-0.15-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode] !>=sys-libs/ncurses-6.1
-SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2c8b1230ec8b3c4bafb5b146bfd8b339
diff --git a/app-misc/dvtm-0.15-r3 b/app-misc/dvtm-0.15-r3
deleted file mode 100644
index 4c988f7c3bfb..000000000000
--- a/app-misc/dvtm-0.15-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=sys-libs/ncurses-6.1:0=[unicode] virtual/pkgconfig
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
-IUSE=savedconfig
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
-SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e6118ec46e06badb62c8d2ccec8c12ff
diff --git a/app-misc/dvtm-9999 b/app-misc/dvtm-9999
deleted file mode 100644
index 9d8ba44b6a6c..000000000000
--- a/app-misc/dvtm-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/ncurses-6.1:0=[unicode] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
-IUSE=savedconfig
-LICENSE=MIT
-RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ccfcdf31766985ace2c95344014102de
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
new file mode 100644
index 000000000000..76c7503cb38e
--- /dev/null
+++ b/app-misc/dvtm/Manifest
@@ -0,0 +1,10 @@
+AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a3be90b6b896e9655dd7b1aa0b6528bb7f2fc92f40d448823990f60f5d58726e7358f6ce8304875ae2dc8903 SHA512 dd660b77457326949d41e80527fc81738c3a54f957f47d2bff94c9ee84dbbc5d2f31d43db9e85311826398c50927d18711816dfabba3ce9cddde0da66e15fe09
+AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d817039b3f09e8108c36e3cdb77c9b6f43f12ebc3f856e9a0d21e9ec8fc82f843166ad16ebf9644ccbd9fc8a80746ce9670d9b7ce191653 SHA512 cea8b8e6974ffc6d891fa176c1d7ef67dfb994bea779b3e7485094f4cd414b8be928ecb0db14e16ce5508b0454465084cde37ee4d09de21f91e18a5a2958931b
+AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
+DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
+DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
+EBUILD dvtm-0.14-r1.ebuild 1527 BLAKE2B 43ab1e43a55d399c801e328368b11c31f99111d2573c723150b0afffd94ebf477e5d17b470eb915dae374ff208e99fed8be85613224657567d136472503f08d5 SHA512 5909230c679470ed169370fdec465f07965934df68446dee6c3bd8312c6cd36ad38fb5a728a3396853abe48e191a8e081db38a3707878958517f82e83d19f45d
+EBUILD dvtm-0.15-r2.ebuild 1280 BLAKE2B d97bac0c3363f068dbb02a464db283cb543e326320615b8062f52e265cf9e738dcbae80a60d40901424f23be18b4b4e832bb9f113ddbd77b5523f5fc301f1383 SHA512 5057a1e1d31f940e71abc9befe7bccf5ea913a1679566524d7bb88ec6aa1a5df27fd01299a47b57c610c87875f94535a37b78f85a650ec4a2f8539d7ba04e374
+EBUILD dvtm-0.15-r3.ebuild 1275 BLAKE2B f498d1be6683e96a8357942b624d204f1794d409f7229b3dbdad4fa1a1ca96c042c33f14d9520accaf88aa717910b58e88304654a1a23a07757211d4e13a309e SHA512 f9f15c4ea40a662437f39a5728ff9d2e90814afd6e96aaebc08b4922dfadc59308242fe50d9d67e0aaf7c2915c39e90538cefd64dc12c0ceb62e0051691cc1a2
+EBUILD dvtm-9999.ebuild 1279 BLAKE2B 3bfb84aa483fc756132d4a51d1662365cb059393c365781c62ff5e4a462f731b6984dbd1a6f8112132c7738e3e13e596d3a141d9641ee5150538ee15efccdcab SHA512 8511e37e945f0fffacfbacb5a6bb0e850a2e72a06365e1fc4f8ca627d80788ce646212f13abc9bc782cec844d599302249f78cccd50c3e9ac74f0169388466f0
+MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.14-r1.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild
new file mode 100644
index 000000000000..bbd504088eee
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.14-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+ SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+ KEYWORDS="amd64 arm x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="unicode"
+
+DEPEND="sys-libs/ncurses:0=[unicode?]"
+RDEPEND="${DEPEND}
+ !>=sys-libs/ncurses-6.1"
+
+src_prepare() {
+ sed -i \
+ -e 's|FLAGS =|FLAGS +=|' \
+ -e 's|-I/usr/local/include||' \
+ -e 's|-L/usr/local/lib||' \
+ -e 's|-Os||' \
+ config.mk || die "sed config.mk failed"
+ use unicode || {
+ sed -i \
+ -e 's|-lncursesw|-lncurses|' \
+ config.mk || die "sed config.mk failed"
+ }
+ sed -i \
+ -e '/strip/d' \
+ -e 's:@tic :@tic -o ${DESTDIR}${PREFIX}/share/terminfo :g' \
+ Makefile || die "sed Makefile failed"
+
+ restore_config config.h
+}
+
+src_compile() {
+ local msg=""
+ use savedconfig && msg=", please check the configfile"
+ emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="/usr" install
+
+ insinto /usr/share/${PN}
+ newins config.h ${PF}.config.h
+
+ dodoc README
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ elog "This ebuild has support for user defined configs"
+ elog "Please read this ebuild for more details and re-emerge as needed"
+ elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-0.15-r2.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild
new file mode 100644
index 000000000000..bc1f7d84a70e
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+ SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="sys-libs/ncurses:0=[unicode]"
+RDEPEND="${COMMON_DEPEND}
+ !>=sys-libs/ncurses-6.1
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.15-gentoo.patch
+)
+
+src_prepare() {
+ default
+
+ restore_config config.h
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+ local msg=""
+ use savedconfig && msg=", please check the configfile"
+ emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+ insinto /usr/share/${PN}
+ newins config.h ${PF}.config.h
+
+ dodoc README.md
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ elog "This ebuild has support for user defined configs"
+ elog "Please read this ebuild for more details and re-emerge as needed"
+ elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
new file mode 100644
index 000000000000..08f42e49fa3e
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+ SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+ KEYWORDS="amd64 arm x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=sys-libs/ncurses-6.1:0=[unicode]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.15-gentoo.patch
+ "${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
+)
+
+src_prepare() {
+ default
+
+ restore_config config.h
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+ local msg=""
+ use savedconfig && msg=", please check the configfile"
+ emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+ insinto /usr/share/${PN}
+ newins config.h ${PF}.config.h
+
+ dodoc README.md
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ elog "This ebuild has support for user defined configs"
+ elog "Please read this ebuild for more details and re-emerge as needed"
+ elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
new file mode 100644
index 000000000000..64b9d7335b2b
--- /dev/null
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+ SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=sys-libs/ncurses-6.1:0=[unicode]"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-gentoo.patch
+ "${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
+)
+
+src_prepare() {
+ default
+
+ restore_config config.h
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+ local msg=""
+ use savedconfig && msg=", please check the configfile"
+ emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+ insinto /usr/share/${PN}
+ newins config.h ${PF}.config.h
+
+ dodoc README.md
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ elog "This ebuild has support for user defined configs"
+ elog "Please read this ebuild for more details and re-emerge as needed"
+ elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/files/dvtm-0.15-gentoo.patch b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
new file mode 100644
index 000000000000..3bb7dec3721f
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
@@ -0,0 +1,36 @@
+--- a/config.mk
++++ b/config.mk
+@@ -10,12 +10,12 @@
+ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+
+ INCS = -I.
+-LIBS = -lc -lutil -lncursesw
+-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
+ CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
+ LDFLAGS += ${LIBS}
+
+-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
++DEBUG_CFLAGS += ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
+
+ CC ?= cc
+ STRIP ?= strip
+--- a/Makefile
++++ b/Makefile
+@@ -16,13 +16,13 @@
+
+ .c.o:
+ @echo CC $<
+- @${CC} -c ${CFLAGS} $<
++ ${CC} -c ${CFLAGS} $<
+
+ ${OBJ}: config.h config.mk
+
+ dvtm: ${OBJ}
+ @echo CC -o $@
+- @${CC} -o $@ ${OBJ} ${LDFLAGS}
++ ${CC} -o $@ ${OBJ} ${LDFLAGS}
+
+ debug: clean
+ @make CFLAGS='${DEBUG_CFLAGS}'
diff --git a/app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch b/app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch
new file mode 100644
index 000000000000..fbf2598f242f
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-0.15-stop-installing-terminfo.patch
@@ -0,0 +1,12 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile 2016-01-09 12:40:56.000000000 +0100
++++ b/Makefile 2018-02-23 00:45:06.436287174 +0100
+@@ -55,8 +55,6 @@
+ @mkdir -p ${DESTDIR}${MANPREFIX}/man1
+ @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+ @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+- @echo installing terminfo description
+- @TERMINFO=${TERMINFO} tic -s dvtm.info
+
+ uninstall:
+ @echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/app-misc/dvtm/files/dvtm-9999-gentoo.patch b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
new file mode 100644
index 000000000000..f29e316c3e5c
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
@@ -0,0 +1,13 @@
+--- a/config.mk
++++ b/config.mk
+@@ -7,8 +7,8 @@
+ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+
+ INCS = -I.
+-LIBS = -lc -lutil -lncursesw
+-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
+ CFLAGS += -std=c99 ${INCS} -DNDEBUG ${CPPFLAGS}
+
+ CC ?= cc
diff --git a/app-misc/dvtm/metadata.xml b/app-misc/dvtm/metadata.xml
new file mode 100644
index 000000000000..6dde16e5c4b6
--- /dev/null
+++ b/app-misc/dvtm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chithanh@gentoo.org</email>
+ <name>Chí-Thanh Christopher Nguyễn</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/editor-wrapper-4 b/app-misc/editor-wrapper-4
deleted file mode 100644
index dea55276b4f3..000000000000
--- a/app-misc/editor-wrapper-4
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Wrapper scripts that will execute EDITOR or PAGER
-EAPI=4
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-_md5_=13ec8eacf49875505b69095caf1e23a2
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
new file mode 100644
index 000000000000..57dfc2ff328c
--- /dev/null
+++ b/app-misc/editor-wrapper/Manifest
@@ -0,0 +1,3 @@
+AUX editor-wrapper-4.sh 405 BLAKE2B 0d1e023e9865f0278bd2fb5e0ceeb0bd8b92befe5544186d163946d7efe6f0a6749184052927b6d60adfec8b2b703168a85fb968bef50702ab42bbbec8bd73fc SHA512 b29f54c662494f9ed0d26c44a8a9a85e22d0d3d70c870fdb8eda3fe1a97ed188e5b8299ed524a5e00f7cb1a3603be340e544192e75b98daa6afda6b2c185faa8
+EBUILD editor-wrapper-4.ebuild 900 BLAKE2B 8bc6c390923b917de50aa6619f6dc87c6961984963784a09b26824965ea15b6427a854810e20dce80277d107e2aea66015e19589348280433a8cc8a35186b80e SHA512 9c181b10b0b88c470a0f868be425c97a48df84eff9f84d94b3e0fc8bcdaccf5ed74c37494dea7af4a2022b0347ba8be3a7f7d86f8a2ded81346db31d9a809f27
+MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
new file mode 100644
index 000000000000..2bf44a1d635f
--- /dev/null
+++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+ sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
+ sed -e 's/@VAR@/PAGER/g' "${FILESDIR}/${P}.sh" >pager || die
+ if use prefix ; then
+ sed -i \
+ -e "s:#!/bin/sh:#!/usr/bin/env sh:" \
+ -e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \
+ editor pager || die
+ fi
+}
+
+src_install() {
+ exeinto /usr/libexec
+ doexe editor pager
+}
diff --git a/app-misc/editor-wrapper/files/editor-wrapper-4.sh b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
new file mode 100644
index 000000000000..b58f1a8b9eeb
--- /dev/null
+++ b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the MIT/X11 license
+
+# Wrapper script, executes ${@VAR@} with arguments $@
+
+if [ -z "${@VAR@}" ]; then
+ # Try to get @VAR@ from system profile
+ @VAR@=$(. /etc/profile >/dev/null 2>&1; echo "${@VAR@}")
+fi
+
+if [ -z "${@VAR@}" ]; then
+ echo "$0: The @VAR@ variable must be set" >&2
+ exit 1
+fi
+
+exec ${@VAR@} "$@"
diff --git a/app-misc/editor-wrapper/metadata.xml b/app-misc/editor-wrapper/metadata.xml
new file mode 100644
index 000000000000..4a19a14fba9d
--- /dev/null
+++ b/app-misc/editor-wrapper/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer type="project">
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/egads-0.9.5 b/app-misc/egads-0.9.5
deleted file mode 100644
index e5c26f6f23a5..000000000000
--- a/app-misc/egads-0.9.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Entropy Gathering And Distribution System
-EAPI=0
-HOMEPAGE=http://www.securesoftware.com/download_egads.htm
-KEYWORDS=~ppc x86 ~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.securesoftware.com/egads/egads-0.9.5.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=db8c230f165fbd0cd00cb7309296c6e9
diff --git a/app-misc/egads-0.9.5-r1 b/app-misc/egads-0.9.5-r1
deleted file mode 100644
index 5c54444bf9da..000000000000
--- a/app-misc/egads-0.9.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Entropy Gathering And Distribution System
-EAPI=6
-HOMEPAGE=http://www.securesoftware.com/download_egads.htm
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.securesoftware.com/egads/egads-0.9.5.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d0900ddfbfad2ff3e1d03e9ec11cfd7c
diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
new file mode 100644
index 000000000000..2a9d5d6d4df8
--- /dev/null
+++ b/app-misc/egads/Manifest
@@ -0,0 +1,4 @@
+DIST egads-0.9.5.tar.gz 302708 BLAKE2B d9d08f08d09b4e5dc3f49f9c0fa14f9ed9a96f74576bcfbada9c9490c544711c05e84266e208a251c74d44ccbc453e3dbb8ce7bd5e3171a401cfc91d04e70c20 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b
+EBUILD egads-0.9.5-r1.ebuild 1013 BLAKE2B 8f27b783b53c6082b6d18e7a276042761f6a549eba2e3a626c2f1867d2cef7c2216342152acd6f108c3858ebe8c7b27dd28db372335793dcfe674d54a2cf058c SHA512 5f2c413108bb0442bbba029299bc29fb26a1b648daa1070f810526e61769c9f9bd8d371b8baf43cd84d0516128f175ef03638892597fb279ec1a5c44c1091eb3
+EBUILD egads-0.9.5.ebuild 1056 BLAKE2B 449f25653cd8845e447225efae54cb8c8d804d746ebf3e98cc4c9844d64e85f73e965abe2fc6bd6c7a65947f67fc88c11f1a75b979b31297ea17841d56f8f649 SHA512 7a301f1d8837e972adb342cee703d71463bc7130296f92b6d6cebbb437c0a3dde8ea7098e843ac2225b241ea53c75b2ba4afbb0558b8425acc633333239f6a50
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..47f7d23b3a5e
--- /dev/null
+++ b/app-misc/egads/egads-0.9.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Entropy Gathering And Distribution System"
+HOMEPAGE="http://www.securesoftware.com/download_egads.htm"
+SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+EGADS_DATADIR=/var/run/egads
+
+src_prepare() {
+ default
+ sed -i \
+ -e '/^BINDIR/d' \
+ -e '/^LIBDIR/d' \
+ -e '/^INCLUDEDIR/d' \
+ "${S}"/Makefile.in || die "Failed to fix Makefile.in"
+ tc-export CC AR RANLIB
+}
+
+src_configure() {
+ econf \
+ --with-egads-datadir="${EGADS_DATADIR}" \
+ --with-bindir=/usr/sbin
+}
+
+src_compile() {
+ emake LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+ keepdir ${EGADS_DATADIR}
+ fperms +t ${EGADS_DATADIR}
+ # NOT parallel safe, and no DESTDIR support
+ emake -j1 install \
+ BINDIR="${D}"/usr/sbin \
+ LIBDIR="${D}"/usr/$(get_libdir) \
+ INCLUDEDIR="${D}"/usr/include
+
+ dodoc README* doc/*.txt doc/*.html
+}
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
new file mode 100644
index 000000000000..d5b679a67010
--- /dev/null
+++ b/app-misc/egads/egads-0.9.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Entropy Gathering And Distribution System"
+HOMEPAGE="http://www.securesoftware.com/download_${PN}.htm"
+SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+egadsdatadir=/var/run/egads
+
+src_unpack() {
+ unpack ${A}
+ sed -i \
+ -e '/^BINDIR/d' \
+ -e '/^LIBDIR/d' \
+ -e '/^INCLUDEDIR/d' \
+ "${S}"/Makefile.in || die "Failed to fix Makefile.in"
+ tc-export CC AR RANLIB
+}
+
+src_compile() {
+ econf \
+ --with-egads-datadir="${egadsdatadir}" \
+ --with-bindir=/usr/sbin \
+ || die
+ emake LIBDIR="/usr/$(get_libdir)" || die
+}
+
+src_install() {
+ keepdir ${egadsdatadir}
+ fperms +t ${egadsdatadir}
+ # NOT parallel safe, and no DESTDIR support
+ emake -j1 install \
+ BINDIR="${D}"/usr/sbin \
+ LIBDIR="${D}"/usr/$(get_libdir) \
+ INCLUDEDIR="${D}"/usr/include \
+ || die
+ dodoc README* doc/*.txt
+ dohtml doc/*.html
+}
diff --git a/app-misc/egads/metadata.xml b/app-misc/egads/metadata.xml
new file mode 100644
index 000000000000..a4e0d354f696
--- /dev/null
+++ b/app-misc/egads/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/elasticsearch-5.6.10 b/app-misc/elasticsearch-5.6.10
deleted file mode 100644
index b53cc55b71b0..000000000000
--- a/app-misc/elasticsearch-5.6.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain
-RDEPEND=virtual/jre:1.8
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.10.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=4a4e34365567d0f6455ba48d3dcbc9d7
diff --git a/app-misc/elasticsearch-6.2.4 b/app-misc/elasticsearch-6.2.4
deleted file mode 100644
index 54c6bf36c175..000000000000
--- a/app-misc/elasticsearch-6.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain
-RDEPEND=virtual/jre:1.8
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=0b731273d7331933140e79fd177d7b89
diff --git a/app-misc/elasticsearch-6.3.1 b/app-misc/elasticsearch-6.3.1
deleted file mode 100644
index 86654b1640eb..000000000000
--- a/app-misc/elasticsearch-6.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain
-RDEPEND=virtual/jre:1.8
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.3.1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=233083e019cbdb837cad01742bcce09e
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
new file mode 100644
index 000000000000..a03390cef4b7
--- /dev/null
+++ b/app-misc/elasticsearch/Manifest
@@ -0,0 +1,17 @@
+AUX elasticsearch-systemd-pre-exec 221 BLAKE2B 22176ca536032f7a7e3724a85100ed3ab5e15a7acacdacf185d733ff272d65712c9166f1d3123cd09a6e3de9a65a29340e0ca7ebb246d359a4d843eddd0ea25b SHA512 1dc41303da367122779759fc1967540357a21aac6df4f5d8761d36dc643673df660b47e5c1b595ecf9316265fe7684ddcb5290df8369379c1bdbc8c933726644
+AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe3329a770c7e5a46e7a6898b9b7f6b0340a19af6e5536856620aa5981e3df0c0c1fa50dd57a204d752ce248 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9
+AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
+AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
+AUX elasticsearch.init.3 1873 BLAKE2B 58c1fa6be05b4fc28ee0b65bb5f95522b5dee4fed706f8a207a48279a5be135e841dc7228f851ed0f8318d1717b810eb4a6048de2590336f31d7de6f72193f57 SHA512 8b4738042882fdbab3979a48174aee2e389570e4fcf5c07b2d2ef990fe9f38097f29c424ff9a7a50bc2b9f2fb0612b0b5d160e31901d34f5b33e21d5fff99b0c
+AUX elasticsearch.init.4 2018 BLAKE2B 5cce066d530afb57e4bc55026d68f57ab41419c6967145efa621051159efdeb5f12e5cbf97d50048d7b7266cc3d2c41e2957c212623cc9139d4b8558dda42864 SHA512 648bb8cf6a5223920db6685be68e439a6854a3d7532ecf6f2fcfaabfc95a5cb768982e7168063926b40eabb0e3a8d4e0a3b4a30213b2a8cbe59eafbeae5cb7c6
+AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
+AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc4585dbdfbd5e834aad0632cc7fbf1005322509183705b62fdfe0f0d105bcc238810056ec066102d8ea84dbb1020 SHA512 33dc3efc736501d6e04ab1aa1b13a4d5f5cb235f7d9ff9674715dd47afdf1e8da8db0a4b82ce46c8c6b71d8258917e8943613eff8a0371a82b5d2e490acefd77
+AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
+AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
+DIST elasticsearch-5.6.10.tar.gz 33796721 BLAKE2B 4e9d1d910a70acf32ca63cec811b711f692f3cf32dcec084a07f92d281eed07c067740bb5c5447055a6d0b6126e55a635edcd08c105dc59985db72bcd031a8a5 SHA512 17bd5710cfc3efa455428a79c74e63aacc9b9481d59a0b0df07ad4e4c25ef32dd41b3dbbde464a2801363b6d428a23eb52cc935640ce86bbc4d8a01dca8a1585
+DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
+DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
+EBUILD elasticsearch-5.6.10.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
+EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
+EBUILD elasticsearch-6.3.1.ebuild 1758 BLAKE2B a4105ef73d07a7f8c5796b8457fdf417ad1dd30f8ff4444eaa064e8a36501c56379eaae07725be98b66776ad9777a66e0844ae625cc1f486d547d49ab13acfbd SHA512 c05e0e1fb1d05178001948a8be071326cac3e7b1e75afdfa22512e498d97603eb6ab6d4b1fcc791388e69170f93bcd493bc41eaf6d8108c50da50f85c371a38c
+MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild
new file mode 100644
index 000000000000..26cfa98675c0
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+ default
+
+ rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+ keepdir /etc/${PN}
+ keepdir /etc/${PN}/scripts
+
+ insinto /etc/${PN}
+ doins -r config/.
+ rm -rv config || die
+
+ insinto /usr/share/${PN}
+ doins -r .
+
+ exeinto /usr/share/${PN}/bin
+ doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+ chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+ keepdir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+ dodir /usr/share/${PN}/plugins
+
+ insinto /etc/sysctl.d
+ newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+ newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
+ newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
+
+pkg_postinst() {
+ elog
+ elog "You may create multiple instances of ${PN} by"
+ elog "symlinking the init script:"
+ elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+ elog
+ elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+ elog "from /etc/elasticsearch into the configuration directory of the instance:"
+ elog "/etc/${PN}/instance"
+ elog
+}
diff --git a/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild b/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild
new file mode 100644
index 000000000000..ad26d333245a
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+ default
+
+ rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+ keepdir /etc/${PN}
+ keepdir /etc/${PN}/scripts
+
+ insinto /etc/${PN}
+ doins -r config/.
+ rm -rv config || die
+
+ fowners root:${PN} /etc/${PN}
+ fperms 2750 /etc/${PN}
+
+ insinto /usr/share/${PN}
+ doins -r .
+
+ exeinto /usr/share/${PN}/bin
+ doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+ chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+ keepdir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+ dodir /usr/share/${PN}/plugins
+
+ insinto /etc/sysctl.d
+ newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+ newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+ newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+ systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
+}
+
+pkg_postinst() {
+ elog
+ elog "You may create multiple instances of ${PN} by"
+ elog "symlinking the init script:"
+ elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+ elog
+ elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+ elog "from /etc/elasticsearch into the configuration directory of the instance:"
+ elog "/etc/${PN}/instance"
+ elog
+}
diff --git a/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
new file mode 100644
index 000000000000..f3e63754b4a0
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+ default
+
+ rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+ keepdir /etc/${PN}
+ keepdir /etc/${PN}/scripts
+
+ insinto /etc/${PN}
+ doins -r config/.
+ rm -rv config || die
+
+ fowners root:${PN} /etc/${PN}
+ fperms 2750 /etc/${PN}
+
+ insinto /usr/share/${PN}
+ doins -r .
+
+ exeinto /usr/share/${PN}/bin
+ doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+ chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+ keepdir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+ dodir /usr/share/${PN}/plugins
+
+ insinto /etc/sysctl.d
+ newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+ newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+ newinitd "${FILESDIR}/${PN}.init.4" ${PN}
+
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+ systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
+}
+
+pkg_postinst() {
+ elog
+ elog "You may create multiple instances of ${PN} by"
+ elog "symlinking the init script:"
+ elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+ elog
+ elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+ elog "from /etc/elasticsearch into the configuration directory of the instance:"
+ elog "/etc/${PN}/instance"
+ elog
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
new file mode 100755
index 000000000000..a51d639bf7d4
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# CONF_FILE setting was removed
+if [ ! -z "$CONF_FILE" ]; then
+ echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
+ exit 1
+fi
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.2 b/app-misc/elasticsearch/files/elasticsearch.conf.2
new file mode 100644
index 000000000000..e802448a86ad
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.conf.2
@@ -0,0 +1,59 @@
+################################
+# Elasticsearch
+################################
+
+# Elasticsearch home directory
+#ES_HOME=/usr/share/elasticsearch
+
+# Elasticsearch Java path
+#JAVA_HOME=
+
+# Elasticsearch configuration directory
+#CONF_DIR=/etc/elasticsearch
+
+# Elasticsearch data directory
+#DATA_DIR=/var/lib/elasticsearch
+
+# Elasticsearch logs directory
+#LOG_DIR=/var/log/elasticsearch
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=
+
+################################
+# Elasticsearch service
+################################
+
+# When executing the init script, this user will be used to run the elasticsearch service.
+# The default value is 'elasticsearch' and is declared in the init.d file.
+# Note that this setting is only used by the init script. If changed, make sure that
+# the configured user can read and write into the data, work, plugins and log directories.
+# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
+#ES_USER=elasticsearch
+#ES_GROUP=elasticsearch
+
+# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
+#ES_STARTUP_SLEEP_TIME=5
+
+################################
+# System properties
+################################
+
+# Specifies the maximum file descriptor number that can be opened by this process
+# When using Systemd, this setting is ignored and the LimitNOFILE defined in
+# /usr/lib/systemd/system/elasticsearch.service takes precedence
+MAX_OPEN_FILES=65536
+
+# The maximum number of bytes of memory that may be locked into RAM
+# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml.
+# When using Systemd, the LimitMEMLOCK property must be set
+# in /usr/lib/systemd/system/elasticsearch.service
+MAX_LOCKED_MEMORY=unlimited
+
+# Maximum number of VMA (Virtual Memory Areas) a process can own
+# When using Systemd, this setting is ignored and the 'vm.max_map_count'
+# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
+#MAX_MAP_COUNT=262144
+
+rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES"
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.3 b/app-misc/elasticsearch/files/elasticsearch.conf.3
new file mode 100644
index 000000000000..70c052a64cce
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.conf.3
@@ -0,0 +1,62 @@
+################################
+# Elasticsearch
+################################
+
+# Elasticsearch home directory
+#ES_HOME=/usr/share/elasticsearch
+
+# Elasticsearch Java path
+#JAVA_HOME=
+
+# Elasticsearch configuration directory
+#CONF_DIR=/etc/elasticsearch
+
+# Elasticsearch data directory
+#DATA_DIR=/var/lib/elasticsearch
+
+# Elasticsearch logs directory
+#LOG_DIR=/var/log/elasticsearch
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=
+
+################################
+# Elasticsearch service
+################################
+
+# When executing the init script, this user will be used to run the elasticsearch service.
+# The default value is 'elasticsearch' and is declared in the init.d file.
+# Note that this setting is only used by the init script. If changed, make sure that
+# the configured user can read and write into the data, work, plugins and log directories.
+# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
+#ES_USER=elasticsearch
+#ES_GROUP=elasticsearch
+
+# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
+#ES_STARTUP_SLEEP_TIME=5
+
+################################
+# System properties
+################################
+
+# Specifies the maximum file descriptor number that can be opened by this process
+# When using Systemd, this setting is ignored and the LimitNOFILE defined in
+# /usr/lib/systemd/system/elasticsearch.service takes precedence
+MAX_OPEN_FILES=65536
+
+# The maximum number of bytes of memory that may be locked into RAM
+# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml.
+# When using Systemd, the LimitMEMLOCK property must be set
+# in /usr/lib/systemd/system/elasticsearch.service
+MAX_LOCKED_MEMORY=unlimited
+
+# Maximum number of VMA (Virtual Memory Areas) a process can own
+# When using Systemd, this setting is ignored and the 'vm.max_map_count'
+# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
+#MAX_MAP_COUNT=262144
+
+# https://www.elastic.co/guide/en/elasticsearch/reference/master/max-number-of-threads.html
+MAX_THREADS=4096
+
+rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES -u $MAX_THREADS"
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.2 b/app-misc/elasticsearch/files/elasticsearch.init.2
new file mode 100644
index 000000000000..6e572c58da25
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.2
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+ ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+ CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+ LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+ ES_BASE_PATH="/var/lib/elasticsearch/_default"
+ CONF_DIR="/etc/elasticsearch"
+ LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+ ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+ use net
+}
+
+start_pre() {
+ if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+ sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+ fi
+
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3
new file mode 100644
index 000000000000..cd89acd9f998
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.3
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+ ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+ CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+ DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+ ES_BASE_PATH="/var/lib/elasticsearch/_default"
+ CONF_DIR="/etc/elasticsearch"
+ DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+ ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+ use net
+}
+
+start_pre() {
+ if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+ sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+ fi
+
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.4 b/app-misc/elasticsearch/files/elasticsearch.init.4
new file mode 100644
index 000000000000..ac3027766103
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.4
@@ -0,0 +1,67 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+ ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+ CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+ DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+ ES_BASE_PATH="/var/lib/elasticsearch/_default"
+ CONF_DIR="/etc/elasticsearch"
+ DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+ ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+ use net
+}
+
+start_pre() {
+ if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+ sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+ fi
+
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+ # fails to start without keystore
+ if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+ "${ES_HOME}/bin/elasticsearch-keystore" create
+ fi
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.service b/app-misc/elasticsearch/files/elasticsearch.service
new file mode 100644
index 000000000000..927acef5ee88
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service
@@ -0,0 +1,53 @@
+[Unit]
+Description=Elasticsearch
+Documentation=http://www.elastic.co
+Wants=network.target
+After=network.target
+
+[Service]
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=CONF_DIR=/etc/elasticsearch
+Environment=DATA_DIR=/var/lib/elasticsearch
+Environment=LOG_DIR=/var/log/elasticsearch
+Environment=PID_DIR=/run/elasticsearch
+EnvironmentFile=-/etc/conf.d/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
+User=elasticsearch
+Group=elasticsearch
+
+ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
+
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
+ -p ${PID_DIR}/elasticsearch.pid \
+ -Edefault.path.home=${ES_HOME} \
+ -Edefault.path.logs=${LOG_DIR} \
+ -Edefault.path.data=${DATA_DIR} \
+ -Edefault.path.conf=${CONF_DIR}
+
+StandardOutput=journal
+StandardError=inherit
+
+# Specifies the maximum file descriptor number that can be opened by this process
+LimitNOFILE=65536
+
+# Specifies the maximum number of bytes of memory that may be locked into RAM
+# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch
+#LimitMEMLOCK=infinity
+
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/elasticsearch/files/elasticsearch.service.2 b/app-misc/elasticsearch/files/elasticsearch.service.2
new file mode 100644
index 000000000000..65324693e8c3
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service.2
@@ -0,0 +1,51 @@
+[Unit]
+Description=Elasticsearch
+Documentation=https://www.elastic.co
+Wants=network.target
+After=network.target
+
+[Service]
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=ES_PATH_CONF=/etc/elasticsearch
+Environment=DATA_DIR=/var/lib/elasticsearch
+Environment=LOG_DIR=/var/log/elasticsearch
+Environment=PID_DIR=/run/elasticsearch
+EnvironmentFile=-/etc/conf.d/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
+User=elasticsearch
+Group=elasticsearch
+
+ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
+
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
+ -p ${PID_DIR}/elasticsearch.pid \
+ -Epath.logs=${LOG_DIR} \
+ -Epath.data=${DATA_DIR}
+
+StandardOutput=journal
+StandardError=inherit
+
+# Specifies the maximum file descriptor number that can be opened by this process
+LimitNOFILE=65536
+
+# Specifies the maximum number of bytes of memory that may be locked into RAM
+# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch
+#LimitMEMLOCK=infinity
+
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/elasticsearch/files/elasticsearch.sysctl.d b/app-misc/elasticsearch/files/elasticsearch.sysctl.d
new file mode 100644
index 000000000000..62ea54d86975
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.sysctl.d
@@ -0,0 +1 @@
+vm.max_map_count=262144
diff --git a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
new file mode 100644
index 000000000000..a551a1f30d4e
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
@@ -0,0 +1 @@
+d /run/elasticsearch 0755 elasticsearch elasticsearch -
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
new file mode 100644
index 000000000000..2d9963a03f57
--- /dev/null
+++ b/app-misc/elasticsearch/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomáš Mózes</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>erkiferenc@gmail.com</email>
+ <name>Ferenc Erki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/email2trac-2.6.2-r1 b/app-misc/email2trac-2.6.2-r1
deleted file mode 100644
index 08a8779df4d2..000000000000
--- a/app-misc/email2trac-2.6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DESCRIPTION=Utilities to convert emails to trac tickets
-EAPI=5
-HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <www-apps/trac-1.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.6.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13483b967b227d58aa1ab9a88d44659
diff --git a/app-misc/email2trac-2.8.4 b/app-misc/email2trac-2.8.4
deleted file mode 100644
index 27e7f892d441..000000000000
--- a/app-misc/email2trac-2.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DESCRIPTION=Utilities to convert emails to trac tickets
-EAPI=5
-HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <www-apps/trac-1.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.8.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad0fa3f47692c73c003e0b363fc59f9a
diff --git a/app-misc/email2trac-2.8.8 b/app-misc/email2trac-2.8.8
deleted file mode 100644
index 5c1d4b780aba..000000000000
--- a/app-misc/email2trac-2.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DESCRIPTION=Utilities to convert emails to trac tickets
-EAPI=5
-HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <www-apps/trac-1.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.8.8.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad0fa3f47692c73c003e0b363fc59f9a
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
new file mode 100644
index 000000000000..75251ff5718a
--- /dev/null
+++ b/app-misc/email2trac/Manifest
@@ -0,0 +1,7 @@
+DIST email2trac-2.6.2.tar.gz 104732 BLAKE2B 0121497f98aeb1c8374e03c5e68f6ccb669dbbff757379121bf34b3c670f2022e31c7bb91bf78f505f490025f028948db98727533f3cb434e5ab49a4548e1269 SHA512 69b596b4c60ccc40b53ddfce5c13d5d7f27ac1fc5674e1cb3fbf84b083c2abc77d36879d665924a62b826e7d3a52d0ead1e1d693a55aae5edfc092998e01a0df
+DIST email2trac-2.8.4.tar.gz 107791 BLAKE2B 69973aab1ff851917bd8db3fa1fc3495da65b9be274d3e433dfc46230a108494b2790441e0f801e4beeaf4126e6fe1ee37a7b2627108bb36e931cc6fe5186e81 SHA512 f0bfd00442d50090f9cc582849026b08bb091bc72223b4569597c2ffdb57759206500da65390dc1609a24e521e137aee072d1ee3412391bf0e4b778933ff2165
+DIST email2trac-2.8.8.tar.gz 108366 BLAKE2B cbe5acac3ca21f19ab630995173dd49b5edf30ebba1bbaf0c575c93d356f8337a1aa6e22c4dd526d6da80041fb8780ea41f773a56eeca5e986930243b34702ff SHA512 8b13d22b50367337e5ed939dc689e0fbde4a63e1932351cab6aac2da7878fd37c9a09ff6e9f9aa4a1f709f24f2808de5d25b494813e292f61ee9be973c601da5
+EBUILD email2trac-2.6.2-r1.ebuild 981 BLAKE2B 176d7107433347ff792ad41ae201bfea766e85609e3fce98fe2fc42b74e590b863fad540c70972ef03b9b022396890842f5556249f9d2342df6478e94e19b261 SHA512 6a8baee10560e563f1b09de0b042b8b06ff3254212e2f35a3ef07bce79327167a7d7ca85afe89acf0656bcdce5affb2ab999880227ebae7b35ba3d4cd238ad8c
+EBUILD email2trac-2.8.4.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
+EBUILD email2trac-2.8.8.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
+MISC metadata.xml 249 BLAKE2B 58e91668bbe25a94a9ee787048ee974f1cb6944ae51bdf9f872f7df04894f44b261855cee2124514219894d93c3b643f9a47bccdf63f9cb0f46adc75528664c9 SHA512 8a900abd5f574a3ada624556efcdc93f5702661e50e03ae696f24ddb8d20a64cbe3bf3f5c71a018c6ad285d580d58eadcf4efc583046532b98405c9629d8d61f
diff --git a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..8ab769b33c37
--- /dev/null
+++ b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Utilities to convert emails to trac tickets"
+HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
+SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ <www-apps/trac-1.1[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+ einfo "You can set the following variables in make.conf:"
+ einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
+ einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
+ -e "s:\$(CC):& ${LDFLAGS} :" \
+ Makefile.in || die 'sed failed'
+}
+
+src_configure() {
+ econf --sysconfdir=/etc/${PN}/ \
+ --with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
+ --with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
+}
diff --git a/app-misc/email2trac/email2trac-2.8.4.ebuild b/app-misc/email2trac/email2trac-2.8.4.ebuild
new file mode 100644
index 000000000000..7c7443a662c4
--- /dev/null
+++ b/app-misc/email2trac/email2trac-2.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Utilities to convert emails to trac tickets"
+HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
+SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ <www-apps/trac-1.2[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+ einfo "You can set the following variables in make.conf:"
+ einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
+ einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
+ -e "s:\$(CC):& ${LDFLAGS} :" \
+ Makefile.in || die 'sed failed'
+}
+
+src_configure() {
+ econf --sysconfdir=/etc/${PN}/ \
+ --with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
+ --with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
+}
diff --git a/app-misc/email2trac/email2trac-2.8.8.ebuild b/app-misc/email2trac/email2trac-2.8.8.ebuild
new file mode 100644
index 000000000000..7c7443a662c4
--- /dev/null
+++ b/app-misc/email2trac/email2trac-2.8.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Utilities to convert emails to trac tickets"
+HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
+SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ <www-apps/trac-1.2[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+ einfo "You can set the following variables in make.conf:"
+ einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
+ einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
+ -e "s:\$(CC):& ${LDFLAGS} :" \
+ Makefile.in || die 'sed failed'
+}
+
+src_configure() {
+ econf --sysconfdir=/etc/${PN}/ \
+ --with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
+ --with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
+}
diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
new file mode 100644
index 000000000000..ad70e38f24e0
--- /dev/null
+++ b/app-misc/email2trac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/emelfm2-0.9.1-r1 b/app-misc/emelfm2-0.9.1-r1
deleted file mode 100644
index 3a5a3db73d00..000000000000
--- a/app-misc/emelfm2-0.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A file manager that implements the popular two-pane design
-EAPI=5
-HOMEPAGE=http://emelfm2.net/
-IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) udisks? ( sys-fs/udisks:2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7430063d83125200a840b7834c6f683c
diff --git a/app-misc/emelfm2-0.9.1-r2 b/app-misc/emelfm2-0.9.1-r2
deleted file mode 100644
index bab85bd3a9cc..000000000000
--- a/app-misc/emelfm2-0.9.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A file manager that implements the popular two-pane design
-EAPI=5
-HOMEPAGE=http://emelfm2.net/
-IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) udisks? ( sys-fs/udisks:2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c09f96cc6c5cc294458d6e232781f8a6
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
new file mode 100644
index 000000000000..55591b3f6b98
--- /dev/null
+++ b/app-misc/emelfm2/Manifest
@@ -0,0 +1,4 @@
+DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
+EBUILD emelfm2-0.9.1-r1.ebuild 1942 BLAKE2B 8b7e2f917fec31da7a02187a6f5ac7e38613b3280a78d1520c707ec9625d08902137ef67e7959c653e8e6f62a8902bf5359491ca2b8e35fa9358ff8b2b0aaf92 SHA512 e44054f8eae6ac29421f737c59179a450ba3ee65e8c30bceecd447be0cfa73681c1c639430d1b21255926ee3133647b6a0dc1275cac465c01fd2f5c237812b58
+EBUILD emelfm2-0.9.1-r2.ebuild 1990 BLAKE2B 175e0b1df279dbb82f8db8a93d24417196adc1c27cfe16a76c551ffd2f13d28964e3889ef3f19cafc98e71e9b94a9b4814fd52ae5ea0ab87696ccb08b5f24771 SHA512 bea46f2f46b9121f067165625f812fa2160b569466cfd91e1a40b01717846f53e7fa8a72b0687c329b8cd4ffec8ab31009e727e05bf5193c9e08b05d811cd27e
+MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..afac8716bab9
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="http://emelfm2.net/"
+SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udisks"
+
+EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.26:2
+ !gtk3? ( >=x11-libs/gtk+-2.12:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ acl? ( sys-apps/acl )
+ gimp? ( media-gfx/gimp )
+ policykit? ( sys-auth/polkit )
+ spell? ( >=app-text/gtkspell-2.0.14:2 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+ sed -i \
+ -e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
+ -e 's:@$(CC):$(CC):g' \
+ -e 's:dbus-glib-1::' \
+ Makefile || die
+
+ local lingua
+ for lingua in ${EMELFM2_LINGUAS[@]}; do
+ has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
+ done
+}
+
+src_configure() {
+ myemelconf=(
+ $(usex acl WITH_ACL=1 WITH_ACL=0)
+ $(usex ansi WITH_OUTPUTSTYLES=1 WITH_OUTPUTSTYLES=0)
+ $(usex gimp WITH_THUMBS=1 WITH_THUMBS=0)
+ $(usex gtk3 'GTK3=1 GTK2=0' 'GTK3=0 GTK2=1')
+ $(usex kernel_linux WITH_KERNELFAM=1 WITH_KERNELFAM=0)
+ $(usex nls I18N=1 I18N=0)
+ $(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
+ $(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
+ $(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
+ DOCS_VERSION=1
+ STRIP=0
+ WITH_TRANSPARENCY=1
+ )
+}
+
+src_compile() {
+ tc-export CC
+ emake \
+ LIB_DIR="/usr/$(get_libdir)" \
+ PREFIX="/usr" \
+ ${myemelconf[@]}
+}
+
+src_install() {
+ emake \
+ LIB_DIR="${D}/usr/$(get_libdir)" \
+ PREFIX="${D}/usr" \
+ ${myemelconf[@]} \
+ install \
+ $(usex nls install_i18n '')
+
+ newicon icons/${PN}_48.png ${PN}.png
+}
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..f59d82948f66
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="http://emelfm2.net/"
+SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udisks"
+
+EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.26:2
+ !gtk3? ( >=x11-libs/gtk+-2.12:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ acl? ( sys-apps/acl )
+ gimp? ( media-gfx/gimp )
+ policykit? ( sys-auth/polkit )
+ spell? ( >=app-text/gtkspell-2.0.14:2 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+ sed -i \
+ -e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
+ -e 's:@$(CC):$(CC):g' \
+ -e 's:dbus-glib-1::' \
+ Makefile || die
+
+ local lingua
+ for lingua in ${EMELFM2_LINGUAS[@]}; do
+ has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
+ done
+}
+
+src_configure() {
+ myemelconf=(
+ $(usex acl WITH_ACL=1 WITH_ACL=0)
+ $(usex ansi WITH_OUTPUTSTYLES=1 WITH_OUTPUTSTYLES=0)
+ $(usex gimp WITH_THUMBS=1 WITH_THUMBS=0)
+ $(usex gtk3 'GTK3=1 GTK2=0' 'GTK3=0 GTK2=1')
+ $(usex kernel_linux WITH_KERNELFAM=1 WITH_KERNELFAM=0)
+ $(usex nls I18N=1 I18N=0)
+ $(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
+ $(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
+ $(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
+ DOCS_VERSION=1
+ STRIP=0
+ WITH_TRANSPARENCY=1
+ )
+}
+
+src_compile() {
+ tc-export CC
+ emake \
+ LIB_DIR="/usr/$(get_libdir)" \
+ PREFIX="/usr" \
+ ${myemelconf[@]}
+}
+
+src_install() {
+ emake \
+ LIB_DIR="${D}/usr/$(get_libdir)" \
+ PREFIX="${D}/usr" \
+ XDG_DESKTOP_DIR="${D}/usr/share/applications" \
+ ${myemelconf[@]} \
+ install $(usex nls install_i18n '')
+
+ newicon icons/${PN}_48.png ${PN}.png
+}
diff --git a/app-misc/emelfm2/metadata.xml b/app-misc/emelfm2/metadata.xml
new file mode 100644
index 000000000000..20b9dda1e27b
--- /dev/null
+++ b/app-misc/emelfm2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <use>
+ <flag name="ansi">Add support for ANSI escape sequences</flag>
+ <flag name="gtk3">Use <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/empty-0.6.20b b/app-misc/empty-0.6.20b
deleted file mode 100644
index fe75c9ffd07e..000000000000
--- a/app-misc/empty-0.6.20b
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Small shell utility, similar to expect(1)
-EAPI=6
-HOMEPAGE=http://empty.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/empty/empty-0.6.20b.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51a8b2c968587e1d548fc307e6cf345b
diff --git a/app-misc/empty/Manifest b/app-misc/empty/Manifest
new file mode 100644
index 000000000000..d49638f2bf85
--- /dev/null
+++ b/app-misc/empty/Manifest
@@ -0,0 +1,4 @@
+AUX empty-respect-LDFLAGS.patch 234 BLAKE2B a344d06f25ec7bd82d5633a9d716eb7235af51d532e9010685fbbea4b51c8deedbd99119403b0d592dc810bd52a70af96d55e3b4e40bbeeb1b7e4100a138c361 SHA512 a3d15d1ca8eb4c422080c24121cd1164ab534a374911fe8500980a3ea92e6bb90d6f8eeb6e1e0d86e49d901f344f2c79c386e8904f3d5f8b2b23c7e8c74463de
+DIST empty-0.6.20b.tgz 16269 BLAKE2B 15a50b2484278cb03b7d91cd5b6a14b9898a3ead3bf2017cc86d9dc8e3a3ec5650b20f57fec6ccdccf780c008841d41205098ea423731c593c1744ca55e5a934 SHA512 bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d
+EBUILD empty-0.6.20b.ebuild 574 BLAKE2B 384b3e508d099891aaf766c66f96f8761fe4abea34e57ac60b982d893a9bee2a780118e26611a95f55299353666a4f5c0c7ef468e63626a9c31c01c57d8c5859 SHA512 64204416242302c0319cf9fa65c4a92fbd58a2e206de2c3d04f7fb6d9de46d34c1fcfd118b53268b56a0cfcc5d302c330e18e7d08d32a9803b1c42bb1e6936fb
+MISC metadata.xml 322 BLAKE2B d700d35373a23c3616b4d1e03a41db4836679833fa880ca2097b2492bb2c34410cf4c39a45928c1daab247ff6ea97a3e778c7e27e9732a42c8adbcb94b94bcef SHA512 f447d9015f3958c33d9035ef5e2b2377f9872a265dcaf37088cc52781f742aeed7665425ad9cbd86d5a00c5336b0c685ed25f5e203f657babf942d940e42f9d3
diff --git a/app-misc/empty/empty-0.6.20b.ebuild b/app-misc/empty/empty-0.6.20b.ebuild
new file mode 100644
index 000000000000..529bce144e10
--- /dev/null
+++ b/app-misc/empty/empty-0.6.20b.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Small shell utility, similar to expect(1)"
+HOMEPAGE="http://empty.sourceforge.net"
+SRC_URI="mirror://sourceforge/empty/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="virtual/logger"
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-respect-LDFLAGS.patch"
+ eapply_user
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin empty
+ doman empty.1
+ dodoc README
+ dodoc -r examples
+}
diff --git a/app-misc/empty/files/empty-respect-LDFLAGS.patch b/app-misc/empty/files/empty-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..f839afcf28c9
--- /dev/null
+++ b/app-misc/empty/files/empty-respect-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- empty-0.6.18b/Makefile
++++ empty-0.6.18b/Makefile
+@@ -16,7 +16,7 @@
+ PREFIX = /usr/local
+
+ all:
+- ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c
++ ${CC} ${CFLAGS} ${LDFLAGS} empty.c ${LIBS} -o empty
+
+ FreeBSD: all
+ NetBSD: all
diff --git a/app-misc/empty/metadata.xml b/app-misc/empty/metadata.xml
new file mode 100644
index 000000000000..c81989e291eb
--- /dev/null
+++ b/app-misc/empty/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">empty</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/enum-1.1-r1 b/app-misc/enum-1.1-r1
deleted file mode 100644
index 23426feb9f86..000000000000
--- a/app-misc/enum-1.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Replacement for GNU seq and BSD jot
-EAPI=6
-HOMEPAGE=https://github.com/hartwork/enum
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/e/n/enum/enum-1.1.tar.bz2
-_md5_=1879c5b9f20cff9de9f5ed97f4d06e7a
diff --git a/app-misc/enum/Manifest b/app-misc/enum/Manifest
new file mode 100644
index 000000000000..5eba1c497f85
--- /dev/null
+++ b/app-misc/enum/Manifest
@@ -0,0 +1,3 @@
+DIST enum-1.1.tar.bz2 100815 BLAKE2B 921a3c1be5dd91ead83366f1f094c8e50b00e9e58bb3316301a9a162255b55b8104ac09ae5913596c6bfb2b58a3358734950073f87fc8bebfb241a8e6ad0879c SHA512 06396c5286c1e7b725c7cd7952713e21eaf917d586a3f069f2faedbf2fd191f2703ac7e67db563a54978542809552c71eda6a238a22fd2a8928d134ec471e931
+EBUILD enum-1.1-r1.ebuild 604 BLAKE2B 43664ee6ef5fb5632d2c092105b714f8f4256a8be6be87785afb072c12047e1b57c2633a324876297e4405e946d797287c81cb03d619a8dfec84c371553be9e6 SHA512 6e382754401a11308dfbb6c1d74698397aab204fac86f58b8b6470a0bf64a9b43475c1ae40a92a53c8b4613b7780fbff015d5bf4dab8f5ac99bb6f31f5530236
+MISC metadata.xml 327 BLAKE2B c4c87de1c4b70265f16d5e78197870b902605cf9cc334a4e0064fdfd3e15a6e01cb9013ca296b8e7ecd805d536dd375925ddcee49f80b1b4125762f971035a04 SHA512 e76ec4d0ea0a8a0c914f41578a52cd0a31942e75f13c3b0f3bd290a86c989f93cae9f5d76ab085acca6a5bc16cfb52429478034a48b9daadc4c95162b11f40ee
diff --git a/app-misc/enum/enum-1.1-r1.ebuild b/app-misc/enum/enum-1.1-r1.ebuild
new file mode 100644
index 000000000000..d125d71a5035
--- /dev/null
+++ b/app-misc/enum/enum-1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Replacement for GNU seq and BSD jot"
+HOMEPAGE="https://github.com/hartwork/enum"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ default
+
+ # Remove bundled getopt
+ rm -rv thirdparty || die
+}
+
+src_configure() {
+ econf \
+ --disable-doc-rebuild \
+ --disable-dependency-tracking
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog
+}
diff --git a/app-misc/enum/metadata.xml b/app-misc/enum/metadata.xml
new file mode 100644
index 000000000000..9001d44827fc
--- /dev/null
+++ b/app-misc/enum/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hartwork/enum</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/esekeyd-1.2.7 b/app-misc/esekeyd-1.2.7
deleted file mode 100644
index 9905b4d2d61e..000000000000
--- a/app-misc/esekeyd-1.2.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Multimedia key daemon that uses the Linux event interface
-EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/esekeyd/
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.burghardt.pl/files/esekeyd-1.2.7.tar.gz
-_md5_=0863931284ef7a97e4b76f61304b8ccc
diff --git a/app-misc/esekeyd/Manifest b/app-misc/esekeyd/Manifest
new file mode 100644
index 000000000000..aeb33c56d8d3
--- /dev/null
+++ b/app-misc/esekeyd/Manifest
@@ -0,0 +1,3 @@
+DIST esekeyd-1.2.7.tar.gz 104502 BLAKE2B d8060837e533c5c3fda11dc3a2d67f3010b820035d1f1a794c296a132f3dde3c17fe132257b996532ae6caa57fe2150c370aa71d03c2e48b9a88568498144769 SHA512 dc15623e0ffdd4cc7f3834b2becabf54ce61ea5190fd44734b2aa426db3d936cb5e3caada82357d6ed41db6eba41e9f792e453e2bb93c0fe62d87ac29651c89a
+EBUILD esekeyd-1.2.7.ebuild 414 BLAKE2B 660aad1d50433168045007b71ae9aff7d4fbd8f09b5422d90ff34dbe044524ff8cd8c8c3ce7386eb5d8f9122899d6ca89e3451332dc676ba655bbb94d89f38f7 SHA512 d7cc489d0150a677215cd8f6ef880baf366cfb698807459d1f125a863d1e09c662f56bc248b5fbdf8483b4910890cae5243c207c3e8e74fc98ef5815f1ed3703
+MISC metadata.xml 242 BLAKE2B 2db42b60282b2aebee2a73678b88c847cdce0bfec89d02b3f60d9e3d8dd0a9b3ce2116e0008ed7ac2d4ff4f4bb57432d425f192ee41eeb5942734c7b724cd726 SHA512 32c1c40f1795067c1b672cee155ba355441626501a25d253710e81f1bc973709dfefe6b02c52b1ae51a0202cb9ae0ea8a6e5ed9f3d617ca93d0745f38bc7b35e
diff --git a/app-misc/esekeyd/esekeyd-1.2.7.ebuild b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
new file mode 100644
index 000000000000..1afe1e9d064c
--- /dev/null
+++ b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
+HOMEPAGE="http://freshmeat.net/projects/esekeyd/"
+SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+
+DOCS=( AUTHORS ChangeLog examples/example.conf NEWS README TODO )
diff --git a/app-misc/esekeyd/metadata.xml b/app-misc/esekeyd/metadata.xml
new file mode 100644
index 000000000000..32efe0b7f32a
--- /dev/null
+++ b/app-misc/esekeyd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="freshmeat">esekeyd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/evemu-2.6.0 b/app-misc/evemu-2.6.0
deleted file mode 100644
index 10d5466d1754..000000000000
--- a/app-misc/evemu-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=app-arch/xz-utils python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-libs/libevdev-1.2.99.902
-DESCRIPTION=tools and bindings for kernel evdev device emulation, data capture, and replay
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-libs/libevdev-1.2.99.902
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/evemu/evemu-2.6.0.tar.xz
-_eclasses_=ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a35392370840d88f9df525599d4c389c
diff --git a/app-misc/evemu-2.7.0 b/app-misc/evemu-2.7.0
deleted file mode 100644
index 15092aaceb69..000000000000
--- a/app-misc/evemu-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=app-arch/xz-utils python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-libs/libevdev-1.2.99.902
-DESCRIPTION=tools and bindings for kernel evdev device emulation, data capture, and replay
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-libs/libevdev-1.2.99.902
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/evemu/evemu-2.7.0.tar.xz
-_eclasses_=ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a35392370840d88f9df525599d4c389c
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
new file mode 100644
index 000000000000..936cc8482f96
--- /dev/null
+++ b/app-misc/evemu/Manifest
@@ -0,0 +1,5 @@
+DIST evemu-2.6.0.tar.xz 507032 BLAKE2B 189507f984e2ebfdf9ff7474d5854ed02f29cd2105684700e1cc2c5ae3c1e888bebd7e8e04e3a5003506bb9571d61785712d08fd90d6e828f2ba5e2ea763a064 SHA512 8dd3be18abc6e36a79b91e6099116048e4fd45a96531a5c2773c84618d6ba7089ee8734b51b9309462c393dc7c3a83d87438bcbdcd5876803165a4ea439aff83
+DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
+EBUILD evemu-2.6.0.ebuild 1028 BLAKE2B 2d149e4c9f50d184941d2564e53748cef34d5303d56cc5e778cc1f2a4d7c7f458b5f13c57488b961eedb6695bbf99b4ed304248099120d97873d33c260e18c43 SHA512 0af553fc116b596a2a521dfeab5771102461e2e600759fed72bcd0510af69e7929e0d84825aea2d15492c201df2b506959b242c2a06f2a6453556c70ecaa7a20
+EBUILD evemu-2.7.0.ebuild 1028 BLAKE2B 2d149e4c9f50d184941d2564e53748cef34d5303d56cc5e778cc1f2a4d7c7f458b5f13c57488b961eedb6695bbf99b4ed304248099120d97873d33c260e18c43 SHA512 0af553fc116b596a2a521dfeab5771102461e2e600759fed72bcd0510af69e7929e0d84825aea2d15492c201df2b506959b242c2a06f2a6453556c70ecaa7a20
+MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-misc/evemu/evemu-2.6.0.ebuild b/app-misc/evemu/evemu-2.6.0.ebuild
new file mode 100644
index 000000000000..8ac8d69567ec
--- /dev/null
+++ b/app-misc/evemu/evemu-2.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-single-r1
+
+DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
+HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ >=dev-libs/libevdev-1.2.99.902"
+DEPEND="app-arch/xz-utils
+ ${RDEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable python python-bindings)
+}
+
+src_test() {
+ if use python ; then
+ if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
+ ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
+ else
+ emake check
+ fi
+ fi
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/app-misc/evemu/evemu-2.7.0.ebuild b/app-misc/evemu/evemu-2.7.0.ebuild
new file mode 100644
index 000000000000..8ac8d69567ec
--- /dev/null
+++ b/app-misc/evemu/evemu-2.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-single-r1
+
+DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
+HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ >=dev-libs/libevdev-1.2.99.902"
+DEPEND="app-arch/xz-utils
+ ${RDEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable python python-bindings)
+}
+
+src_test() {
+ if use python ; then
+ if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
+ ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
+ else
+ emake check
+ fi
+ fi
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/app-misc/evemu/metadata.xml b/app-misc/evemu/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/app-misc/evemu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/evtest-1.30 b/app-misc/evtest-1.30
deleted file mode 100644
index 0b2cacf3af7c..000000000000
--- a/app-misc/evtest-1.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=xml? ( dev-libs/libxml2 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=test program for capturing input device events
-EAPI=4
-HOMEPAGE=https://cgit.freedesktop.org/evtest/
-IUSE=+xml
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=GPL-2
-RDEPEND=xml? ( dev-libs/libxml2 )
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/evtest/snapshot/evtest-evtest-1.30.tar.gz -> evtest-1.30.tar.gz mirror://gentoo/evtest-1.30-mans.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3415a48ee0716124242c1b3cab69e1e2
diff --git a/app-misc/evtest-1.31 b/app-misc/evtest-1.31
deleted file mode 100644
index 96086d2321f9..000000000000
--- a/app-misc/evtest-1.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=test program for capturing input device events
-EAPI=4
-HOMEPAGE=https://cgit.freedesktop.org/evtest/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/evtest/snapshot/evtest-evtest-1.31.tar.gz -> evtest-1.31.tar.gz mirror://gentoo/evtest-1.31-mans.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aefc149a4bdc38ecd992fe082b6bee3d
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
new file mode 100644
index 000000000000..7ed40985aab4
--- /dev/null
+++ b/app-misc/evtest/Manifest
@@ -0,0 +1,9 @@
+AUX evtest-1.30-autoconf.patch 974 BLAKE2B 704e0b7114651ec950ccabf34206c10c6d6fc93e494b30dd1db2edc3cbcea4f8fa6cd601c5f61f9936927a98e1c915a53b5d463f6f0d03c2a71f04ed04ea9eae SHA512 7b4fc165bd5d9dccd34ad47bcab017da08e4efb47783925c75a68de4dde32a873018a19089b01e845ea55769d943b3eaddb962a2bd99fb1e62d4444c28c3630e
+AUX evtest-1.30-xml.patch 1362 BLAKE2B ac7f9c1e190b6292d2282ebea9f88ad5b6c5354b6d422a3f07e24d19b98229cf39a3f0f612c1f8e626551b4947bb334f82553f6e473d86a6f71b8e38a3a79959 SHA512 b558f97af8f14e7d316990f7657a7429b26b0df2d54a5adf849ee3237d1613e0d629f36f72963b31baa7fdf78db8bda0e687ff5925cb86a8afd0dbc4058b3c30
+DIST evtest-1.30-mans.tar.gz 2112 BLAKE2B 63981baf8c69993850d974f9bc94a9b96a45c3bb51379a6788e18715785475d8f3324134d5906b7188c950bf0d05fb138f4680e3a191cdfe6f13143eab44bd13 SHA512 470ac504091f9826023dd2cc62a1c0169f98bf2d6e9c4c3986e3719d67d02bb587023aa347a3fb26b0d06efae8eccdd05d88ae74556f3819416a6f6c905c4618
+DIST evtest-1.30.tar.gz 25556 BLAKE2B c396940af72faeb27143472cd62c3ada3016fea67184bdac2708a6d6347b07e4cc5a994b5c585263faa00d82003ed4f4859f51ed53a374e985389dc8102f8dff SHA512 ea995c37c0cf8dd8a4c493895bd039e4adac5056a06e9e0275e879ca1e774e98b5cf42bc77f1ad34225b15282cc4edb6dc088cb6fb16f82250bc35fb3975c4bf
+DIST evtest-1.31-mans.tar.gz 1661 BLAKE2B fc7763703299a7129e7332378df6190d42089776e9b2f88d1e9bd42592e2945313046e798862590869f7eb76e56136cec6d575ec9301d5cd9af44b810e13c676 SHA512 b3cd5cc8aaf6620a3243318ae42e807a8819a25082606707787ab8b1ac75f1f6dfc8b544d38a74b489d348981489153c33841ba0b0466ace3e3a83b031754321
+DIST evtest-1.31.tar.gz 17968 BLAKE2B 09ca1cfbac40f84d6715625a932839d8095caeae26b2dcfab73f66651d7d315381ccb92c50aa5b9b68f9495a4e48f2ce6d0fe2b7243b7ec91e4e4acee530e49b SHA512 1657d880c531c6c8407bf7a66ab159a5992c9ab70b840e600e91ad3a7429a07ec2c2f3bca6848614ebbad01a4a5993e43e4388705455f9d31f8b60b06c04a7c4
+EBUILD evtest-1.30.ebuild 1137 BLAKE2B e0dc80254b8be13b6cb5ac242b32f411ee34800119ccfc0df13f35b1ce24d7274fa372f646bcd7b62632bc617602069f9b754705a64da84e0f2c62da2f3474ab SHA512 43300763245c9d70a104185f20f38b70390d2a978d6fc9dfd7f5c10309c4869d61abc04b15c9452fd8281f612e0892262b767e335b61e4ecec672d270b791877
+EBUILD evtest-1.31.ebuild 1014 BLAKE2B 67bce706b3636e29a64a35901a11ec505a0f863cf07bea3d78aed0ace27b422b8c12de9532d4c9c3828e673224c3c8121646e36743b0313119bcbca7414159b7 SHA512 e6e3ae4b6cb3a246ca0c8953ddec187907b3300e535dce3255f1abbbcb9eaf965761cf11886e2acb5846d390073fe0661bd4af610f1ccec3d2be574335a027a8
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/evtest/evtest-1.30.ebuild b/app-misc/evtest/evtest-1.30.ebuild
new file mode 100644
index 000000000000..cbc2f0a66a97
--- /dev/null
+++ b/app-misc/evtest/evtest-1.30.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="test program for capturing input device events"
+HOMEPAGE="https://cgit.freedesktop.org/evtest/"
+SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz
+ mirror://gentoo/${P}-mans.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="+xml"
+
+# We bundled the man pages ourselves to avoid xmlto/asciidoc.
+# We need libxml2 for the capture tool. While at runtime,
+# we have a file that can be used with xsltproc, we don't
+# directly need it ourselves, so don't depend on libxslt.
+# tar zcf ${P}-mans.tar.gz *.1 --transform=s:^:evtest-${P}/:
+RDEPEND="xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.30-autoconf.patch
+ epatch "${FILESDIR}"/${PN}-1.30-xml.patch
+ eautoreconf
+}
+
+src_configure() {
+ # We pre-compile the man pages.
+ XMLTO=/bin/true ASCIIDOC=/bin/true \
+ econf $(use_enable xml)
+}
diff --git a/app-misc/evtest/evtest-1.31.ebuild b/app-misc/evtest/evtest-1.31.ebuild
new file mode 100644
index 000000000000..74195303d4bd
--- /dev/null
+++ b/app-misc/evtest/evtest-1.31.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="test program for capturing input device events"
+HOMEPAGE="https://cgit.freedesktop.org/evtest/"
+SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz
+ mirror://gentoo/${P}-mans.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# We bundled the man pages ourselves to avoid xmlto/asciidoc.
+# We need libxml2 for the capture tool. While at runtime,
+# we have a file that can be used with xsltproc, we don't
+# directly need it ourselves, so don't depend on libxslt.
+# tar zcf ${P}-mans.tar.gz *.1 --transform=s:^:evtest-${P}/:
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ # We pre-compile the man pages.
+ XMLTO=$(type -P true) ASCIIDOC=$(type -P true) \
+ econf
+}
diff --git a/app-misc/evtest/files/evtest-1.30-autoconf.patch b/app-misc/evtest/files/evtest-1.30-autoconf.patch
new file mode 100644
index 000000000000..940c1316fd6f
--- /dev/null
+++ b/app-misc/evtest/files/evtest-1.30-autoconf.patch
@@ -0,0 +1,33 @@
+From d3864018ef09ef38e1733110e2643735067bc02f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 6 Jan 2013 14:49:40 -0500
+Subject: [PATCH] use newer config headers macro
+
+With newer automake, it throws an error:
+configure.ac:5: error: 'AM_CONFIG_HEADER': this macro is obsolete.
+ You should use the 'AC_CONFIG_HEADERS' macro instead.
+
+The newer macro has been around a long time, so there's no need to
+worry about backwards compat here.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ebf657f..9980c5a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
+ AC_INIT(evtest,[1.30], [https://bugzilla.freedesktop.org/enter_bug.cgi?product=evtest], evtest)
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_PROG_CC
+ AC_PROG_INSTALL
+
+--
+1.8.0.2
+
diff --git a/app-misc/evtest/files/evtest-1.30-xml.patch b/app-misc/evtest/files/evtest-1.30-xml.patch
new file mode 100644
index 000000000000..1fe3e6c7c34b
--- /dev/null
+++ b/app-misc/evtest/files/evtest-1.30-xml.patch
@@ -0,0 +1,40 @@
+From 92ecfec7b0a9c1f8d952d20e8a0cde5930f9264f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 6 Jan 2013 15:09:26 -0500
+Subject: [PATCH] add a configure flag to control xml behavior
+
+The default behavior (autodetection) is unchanged.
+This adds a knob for distros to control directly.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9980c5a..e973733 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,11 +5,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AC_CONFIG_HEADERS(config.h)
+ AC_PROG_CC
+ AC_PROG_INSTALL
++PKG_PROG_PKG_CONFIG
+
+-PKG_CHECK_MODULES(XML, libxml-2.0, [HAVE_LIBXML=yes], [HAVE_LIBXML=no])
+-if test x$HAVE_LIBXML = "xno"; then
+- AC_MSG_WARN([libxml headers not available. Cannot build evtest-capture.])
+-fi
++AC_ARG_ENABLE([xml], [AS_HELP_STRING([--disable-xml], [Disable support for xml (evtest-capture)])])
++AS_IF([test "x$enable_xml" != "xno"], [
++ PKG_CHECK_MODULES(XML, libxml-2.0, [HAVE_LIBXML=yes], [HAVE_LIBXML=no])
++ AS_IF([test "x$enable_xml$HAVE_LIBXML" = "xyesno"], [
++ AC_MSG_ERROR([libxml headers not available. Cannot build evtest-capture.])
++ ])
++])
+ AM_CONDITIONAL(HAVE_LIBXML, [test "x$HAVE_LIBXML" = "xyes"])
+
+ AC_PATH_PROG(XSLTPROC, [xsltproc])
+--
+1.8.0.2
+
diff --git a/app-misc/evtest/metadata.xml b/app-misc/evtest/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/evtest/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/faq-0.0.1 b/app-misc/faq-0.0.1
deleted file mode 100644
index 32bd22c0cb9e..000000000000
--- a/app-misc/faq-0.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Format agnostic jQ
-EAPI=6
-HOMEPAGE=https://github.com/jzelinskie/faq
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/jzelinskie/faq/archive/0.0.1.tar.gz -> faq-0.0.1.tar.gz https://github.com/Azure/draft/archive/53924464463d2474f410415f1310d2b95fb8965f.tar.gz -> github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/ashb/jqrepl/archive/70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz -> github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz https://github.com/clbanning/mxj/archive/eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz -> github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/globalsign/mgo/archive/baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz -> github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jbrukh/bayesian/archive/bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz -> github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/zeebo/bencode/archive/d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz -> github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz https://github.com/golang/crypto/archive/88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz -> github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz https://github.com/golang/sys/archive/13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz -> github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz https://github.com/go-yaml/yaml/archive/86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz -> github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
-_md5_=aaa523415aefd0443dac19764dd64aee
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
new file mode 100644
index 000000000000..64013ec3ce07
--- /dev/null
+++ b/app-misc/faq/Manifest
@@ -0,0 +1,18 @@
+DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
+DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
+DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
+DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
+DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
+DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
+DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
+DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
+DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
+DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
+DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
+DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
+DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
+EBUILD faq-0.0.1.ebuild 1768 BLAKE2B bf175e390eb6cf4d0a125b1623dac6c8513085a82c55559c56710eddec75a139a1d68cbaccb74469acf69bf0af038344dd30e53705b7bd6d32f5ff534de2ff74 SHA512 2bbc7f2b9752397c5861b16bc053d09a46a2bf7a0ebf23f367620eed404d0a19ada0711f50fbb71d742127f260779594a60d07a7aa675459b47f73a55562bba9
+MISC metadata.xml 324 BLAKE2B 4e3f348285a9ba513382c20b245bcaf32529fa44a7b9152f3f3ee99e4e730d056ea06a808d0797ff02fe0a1a38a39959ca364bf85dba177d9a6bb70575f92488 SHA512 19ca8fa72afdebb725d33ff7f0faacf4e643c4c13af81980bf96beef3f2d29614d2ea5de4a347a7b83006078ae6d23f92fe58ed25b690699478abb743670a654
diff --git a/app-misc/faq/faq-0.0.1.ebuild b/app-misc/faq/faq-0.0.1.ebuild
new file mode 100644
index 000000000000..ddd31a08b0a2
--- /dev/null
+++ b/app-misc/faq/faq-0.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jzelinskie/faq"
+
+EGO_VENDOR=(
+ "github.com/Azure/draft 53924464463d2474f410415f1310d2b95fb8965f"
+ "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+ "github.com/ashb/jqrepl 70de3caa122cf7c7a737f28b666ab0d541560598"
+ "github.com/clbanning/mxj eb2e8a1ed220896d2b16890436447a0eae496fae"
+ "github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+ "github.com/globalsign/mgo baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
+ "github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+ "github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+ "github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+ "github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
+ "golang.org/x/crypto 88942b9c40a4c9d203b82b3731787b672d6e809b github.com/golang/crypto"
+ "golang.org/x/sys 13d03a9a82fba647c21a0ef8fba44a795d0f0835 github.com/golang/sys"
+ "gopkg.in/yaml.v2 86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Format agnostic jQ"
+HOMEPAGE="https://github.com/jzelinskie/faq"
+SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+ pushd src || die
+ GOPATH="${S}" go install github.com/jzelinskie/faq
+ popd || die
+}
+
+src_install() {
+ dobin bin/${PN}
+ pushd src/${EGO_PN} || die
+ dodoc README.md docs/examples.md
+ popd || die
+}
diff --git a/app-misc/faq/metadata.xml b/app-misc/faq/metadata.xml
new file mode 100644
index 000000000000..9003aa1128ff
--- /dev/null
+++ b/app-misc/faq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jzelinksie/faq</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/fdupes-1.5.1 b/app-misc/fdupes-1.5.1
deleted file mode 100644
index ee81471fcc58..000000000000
--- a/app-misc/fdupes-1.5.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Identify/delete duplicate files residing within specified directories
-EAPI=5
-HOMEPAGE=https://github.com/adrianlopezroche/fdupes
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/adrianlopezroche/fdupes/archive/fdupes-1.51.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17dc625bb51b6570cfee903191cc3a36
diff --git a/app-misc/fdupes-1.6.1 b/app-misc/fdupes-1.6.1
deleted file mode 100644
index e0d91ea5ec07..000000000000
--- a/app-misc/fdupes-1.6.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Identify/delete duplicate files residing within specified directories
-EAPI=5
-HOMEPAGE=https://github.com/adrianlopezroche/fdupes
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/adrianlopezroche/fdupes/archive/v1.6.1.tar.gz -> fdupes-1.6.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7de500ed8da585ec3a9bc93bb2843ccd
diff --git a/app-misc/fdupes-1.6.1-r1 b/app-misc/fdupes-1.6.1-r1
deleted file mode 100644
index cb6d262a29df..000000000000
--- a/app-misc/fdupes-1.6.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Identify/delete duplicate files residing within specified directories
-EAPI=6
-HOMEPAGE=https://github.com/adrianlopezroche/fdupes
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/adrianlopezroche/fdupes/archive/v1.6.1.tar.gz -> fdupes-1.6.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24a154145b19061e19155db0c8e454ed
diff --git a/app-misc/fdupes-9999 b/app-misc/fdupes-9999
deleted file mode 100644
index 4b1fe3af75d4..000000000000
--- a/app-misc/fdupes-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Identify/delete duplicate files residing within specified directories
-EAPI=6
-HOMEPAGE=https://github.com/adrianlopezroche/fdupes
-LICENSE=MIT
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dfda079cac1c2ff6c96bda3ec685134
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
new file mode 100644
index 000000000000..4f3943a18737
--- /dev/null
+++ b/app-misc/fdupes/Manifest
@@ -0,0 +1,12 @@
+AUX fdupes-1.50_pre2-compare-file.patch 2002 BLAKE2B 235dea1ccd34b5c75bb289af920fbc51151703ff81ff9f7bc31f9f9fc1c243791fdb1e3c7c6439b8f5ec45a7985aea2fd87df92394346183ecdba4750bf4ee35 SHA512 53a61081cf4f0cde8ec98926edea6a6d46864b0b48f30c2112148f1aa92971b3127dd04a55689a9ba408d52a43ff0a6ebccbe5f1ff918e83943c942beca086a3
+AUX fdupes-1.50_pre2-typo.patch 675 BLAKE2B 790bc07cc4e83a3dfc8736417d8e5eb5c892ef6d4eb452ead369ef6e700f530e45e0410b2b03702592032a78207f700a812673abf75d1cfe6387e0952ce9885d SHA512 fdc313c2bfa44c17bc30f2f001f06b818eeea7fddc0b2c6a600b4694cbaeb53aa4fcfd93a7fe6eb0b6d48297b1a8654481f8efa57e2a78908e75b35df5959619
+AUX fdupes-1.51-fix-stdin-lvalue.patch 585 BLAKE2B 15bff93ab94497d4cafa27baa27fd8a214a16efb7a90d5d42926141b4a02e5fc36d0b353eab93ffe8ef512f6039deb81e1448e28a259f87d78459db50d1ecdb1 SHA512 87ddc27a1125a5500be9120781d7b7b695f638af6219498e200d375bca5b98f009d25905ca7d72dde7ebea2bd58a4e23db48843eef5dabeff6cb95194e9bc7c1
+AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a91f2c8360a63ca7a0078df21d9fb9b01a9adc8e670f70545946ba7dd594287e701ca31caa1f34b57d4c8ee2d99db SHA512 965b8eda17f52b822657373f3aa6d624900477c43d50fd507f853ffe10764184dac6c0f46cf40cbe371eec69f12434a63b49759c94512896640c9001641d0a8d
+AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
+DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
+DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
+EBUILD fdupes-1.5.1.ebuild 961 BLAKE2B 2d19c1ddba82e8223da2a54f52b448a2c9be964f19c516ee62bb9b9100d5887cc3f3eae51263fabdbb63dc66cf24d9e348f1b2cc273917e1d439612ed0aa1bbb SHA512 07c76d4c55477f6403da7792e827e67ac4150d04c8387b001a6a3ea52c879f41e8f11ea0746a499cf4380f0148628d6a354a87b065d286ebe60e5d5b89571801
+EBUILD fdupes-1.6.1-r1.ebuild 684 BLAKE2B 18a6313c4e2f3192c049db83278630ba938cbf8e48503f672b1be4ff6a3fc5e2071b8cda985ace481c3fa2fa093f35df9bd0a274cb8f2c376d0111fa1407e6e6 SHA512 84434c700455f906ecc95f8386117c338cad2150bbd7b5fabf5a9e4251618a0831410aa2e9c817e4a6971d2aee1477da44e5e1d76f5444422177469c1678f4f7
+EBUILD fdupes-1.6.1.ebuild 707 BLAKE2B 6c1f60031766bb4d10490242dfcca71afd27875802e742a3bddfae3e976610dc5252ba4ccfe71e036efee845f014a83818b493bf6202271743970537d6846845 SHA512 0be0c0134f22a83e3e862b828d151fc20ef76635e33a77a4c6c0e93eb2a4197951be64c64a698466e61b3238aa06edac4593bcf727fc7d54c50597b22c3a5278
+EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
+MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
new file mode 100644
index 000000000000..ac75fedd87d6
--- /dev/null
+++ b/app-misc/fdupes/fdupes-1.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${PN}-${PV/_pre/-PR}"
+MY_P="${MY_P/5\.1/51}"
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.51-makefile.patch \
+ "${FILESDIR}"/${PN}-1.50_pre2-compare-file.patch \
+ "${FILESDIR}"/${PN}-1.50_pre2-typo.patch \
+ "${FILESDIR}"/${PN}-1.51-fix-stdin-lvalue.patch
+
+ append-lfs-flags
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin fdupes
+ doman fdupes.1
+ dodoc CHANGES CONTRIBUTORS README TODO
+}
diff --git a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild b/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..b127dfcbd858
--- /dev/null
+++ b/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+src_prepare() {
+ default
+ append-lfs-flags
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/fdupes/fdupes-1.6.1.ebuild b/app-misc/fdupes/fdupes-1.6.1.ebuild
new file mode 100644
index 000000000000..2858047c4d5b
--- /dev/null
+++ b/app-misc/fdupes/fdupes-1.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+src_prepare() {
+ append-lfs-flags
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin fdupes
+ doman fdupes.1
+ dodoc CHANGES CONTRIBUTORS README TODO
+}
diff --git a/app-misc/fdupes/fdupes-9999.ebuild b/app-misc/fdupes/fdupes-9999.ebuild
new file mode 100644
index 000000000000..f27d34c2d82a
--- /dev/null
+++ b/app-misc/fdupes/fdupes-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic git-r3 toolchain-funcs
+
+MY_P="${PN}-${PV/_pre/-PR}"
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS=""
+SRC_URI=""
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+DOCS=( CHANGES CONTRIBUTORS README )
+
+src_configure() {
+ append-lfs-flags
+ tc-export CC
+}
+
+src_install() {
+ emake PREFIX="/usr" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch
new file mode 100644
index 000000000000..fa9e2a34a893
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch
@@ -0,0 +1,58 @@
+diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
+--- fdupes-1.50-PR2.orig/fdupes.c 2009-01-31 20:11:49.577968848 +0530
++++ fdupes-1.50-PR2/fdupes.c 2009-01-31 22:01:11.872219443 +0530
+@@ -492,7 +492,10 @@ file_t **checkmatch(filetree_t **root, f
+ else {
+ if (checktree->file->crcpartial == NULL) {
+ crcsignature = getcrcpartialsignature(checktree->file->d_name);
+- if (crcsignature == NULL) return NULL;
++ if (crcsignature == NULL) {
++ errormsg ("cannot read file %s\n", checktree->file->d_name);
++ return NULL;
++ }
+
+ checktree->file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
+ if (checktree->file->crcpartial == NULL) {
+@@ -504,7 +507,10 @@ file_t **checkmatch(filetree_t **root, f
+
+ if (file->crcpartial == NULL) {
+ crcsignature = getcrcpartialsignature(file->d_name);
+- if (crcsignature == NULL) return NULL;
++ if (crcsignature == NULL) {
++ errormsg ("cannot read file %s\n", file->d_name);
++ return NULL;
++ }
+
+ file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
+ if (file->crcpartial == NULL) {
+@@ -577,8 +583,8 @@ file_t **checkmatch(filetree_t **root, f
+
+ int confirmmatch(FILE *file1, FILE *file2)
+ {
+- unsigned char c1 = 0;
+- unsigned char c2 = 0;
++ unsigned char c1[CHUNK_SIZE];
++ unsigned char c2[CHUNK_SIZE];
+ size_t r1;
+ size_t r2;
+
+@@ -586,14 +592,13 @@ int confirmmatch(FILE *file1, FILE *file
+ fseek(file2, 0, SEEK_SET);
+
+ do {
+- r1 = fread(&c1, sizeof(c1), 1, file1);
+- r2 = fread(&c2, sizeof(c2), 1, file2);
++ r1 = fread(c1, 1, sizeof(c1), file1);
++ r2 = fread(c2, 1, sizeof(c2), file2);
+
+- if (c1 != c2) return 0; /* file contents are different */
+- } while (r1 && r2);
++ if (r1 != r2) return 0; /* file lengths are different */
++ if (memcmp (c1, c2, r1)) return 0; /* file contents are different */
++ } while (r2);
+
+- if (r1 != r2) return 0; /* file lengths are different */
+-
+ return 1;
+ }
+
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch
new file mode 100644
index 000000000000..1615a15f49b1
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch
@@ -0,0 +1,12 @@
+diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1
+--- fdupes-1.50-PR2.orig/fdupes.1 2009-01-31 20:11:49.581967819 +0530
++++ fdupes-1.50-PR2/fdupes.1 2009-01-31 20:32:46.383969471 +0530
+@@ -84,7 +84,7 @@ If fdupes returns with an error message
+ .B fdupes: error invoking md5sum
+ it means the program has been compiled to use an external
+ program to calculate MD5 signatures (otherwise, fdupes uses
+-interal routines for this purpose), and an error has occurred
++internal routines for this purpose), and an error has occurred
+ while attempting to execute it. If this is the case, the
+ specified program should be properly installed prior
+ to running fdupes.
diff --git a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch
new file mode 100644
index 000000000000..65c06e3f1ddf
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch
@@ -0,0 +1,20 @@
+This is a combination of upstream's fe2d8334 and 03abad. See
+https://bugs.gentoo.org/show_bug.cgi?id=574610.
+
+diff -Naur fdupes-1.51.orig/fdupes.c fdupes-1.51/fdupes.c
+--- fdupes-1.51.orig/fdupes.c 2013-04-20 14:02:18.000000000 -0400
++++ fdupes-1.51/fdupes.c 2016-02-29 02:45:36.360804360 -0500
+@@ -1164,7 +1164,12 @@
+ }
+ else
+ {
+- stdin = freopen("/dev/tty", "r", stdin);
++ if (freopen("/dev/tty", "r", stdin) == 0)
++ {
++ errormsg("could not open terminal for input\n");
++ exit(1);
++ }
++
+ deletefiles(files, 1, stdin);
+ }
+ }
diff --git a/app-misc/fdupes/files/fdupes-1.51-makefile.patch b/app-misc/fdupes/files/fdupes-1.51-makefile.patch
new file mode 100644
index 000000000000..138914239a90
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.51-makefile.patch
@@ -0,0 +1,23 @@
+--- fdupes-1.50-PR2/Makefile.orig 2010-11-19 19:05:18.152330536 -0800
++++ fdupes-1.50-PR2/Makefile 2010-11-19 19:06:00.998659992 -0800
+@@ -72,9 +72,9 @@
+ # Make Configuration
+ #
+ CC = gcc
+-COMPILER_OPTIONS = -Wall -O -g
++COMPILER_OPTIONS = -Wall
+
+-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
++CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
+
+ INSTALL_PROGRAM = $(INSTALL) -c -m 0755
+ INSTALL_DATA = $(INSTALL) -c -m 0644
+@@ -94,7 +94,7 @@
+ all: fdupes
+
+ fdupes: $(OBJECT_FILES)
+- $(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES)
+
+ installdirs:
+ test -d $(BIN_DIR) || $(MKDIR) $(BIN_DIR)
diff --git a/app-misc/fdupes/files/fdupes-9999-gentoo.patch b/app-misc/fdupes/files/fdupes-9999-gentoo.patch
new file mode 100644
index 000000000000..4c6edda50e04
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-9999-gentoo.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -71,9 +71,9 @@
+ # Make Configuration
+ #
+ CC ?= gcc
+-COMPILER_OPTIONS = -Wall -O -g
++COMPILER_OPTIONS = -Wall
+
+-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
++CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
+
+ INSTALL_PROGRAM = $(INSTALL) -c -m 0755
+ INSTALL_DATA = $(INSTALL) -c -m 0644
diff --git a/app-misc/fdupes/metadata.xml b/app-misc/fdupes/metadata.xml
new file mode 100644
index 000000000000..4a5652d5b09e
--- /dev/null
+++ b/app-misc/fdupes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">adrianlopezroche/fdupes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/fdutils-5.5.20060227 b/app-misc/fdutils-5.5.20060227
deleted file mode 100644
index 54d55a668e89..000000000000
--- a/app-misc/fdutils-5.5.20060227
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-fs/mtools-4 sys-apps/texinfo virtual/os-headers doc? ( virtual/texi2dvi )
-DESCRIPTION=utilities for configuring and debugging the Linux floppy driver
-EAPI=5
-HOMEPAGE=https://fdutils.linux.lu
-IUSE=doc
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/mtools-4
-SLOT=0
-SRC_URI=mirror://debian/pool/main/f/fdutils/fdutils_5.5-20060227.orig.tar.gz mirror://debian/pool/main/f/fdutils/fdutils_5.5-20060227-6.debian.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a327ee55e6820c5ef4a6ff1da76ae3c2
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
new file mode 100644
index 000000000000..c16294dff19f
--- /dev/null
+++ b/app-misc/fdutils/Manifest
@@ -0,0 +1,4 @@
+DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
+DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
+EBUILD fdutils-5.5.20060227.ebuild 1344 BLAKE2B 3e80aef85d10e768ba7a18aabc9e25e746adf1eb4ff7b4c9b7a340e3158159901bdf7c071abdb817afba9c805708bdd8ed3c2b97a668793929fa534ce65b69ce SHA512 52042b4a2d05e325a64cd85703c777af4c154d6e79e59ac04fb138f1798ccaa60dfc9f5312390a382214d41ef59dcd933bf40b8c369952747ecea8a4791d95e9
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
new file mode 100644
index 000000000000..1116db851a7f
--- /dev/null
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${PN}_5.5-20060227
+
+DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
+HOMEPAGE="https://fdutils.linux.lu"
+SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
+ mirror://debian/pool/main/f/${PN}/${MY_P}-6.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="doc"
+
+RDEPEND=">=sys-fs/mtools-4"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ virtual/os-headers
+ doc? ( virtual/texi2dvi )"
+
+S=${WORKDIR}/${PN}-5.5-20060227
+
+src_prepare() {
+ local d="${WORKDIR}"/debian/patches
+ EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+ sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
+ # The build sets up config.h and uses some symbols, but forgots to
+ # actually include it in most places.
+ sed -i '1i#include "../config.h"' src/*.c || die #580060
+}
+
+src_configure() {
+ econf --enable-fdmount-floppy-only
+}
+
+src_compile() {
+ emake -j1 $(use doc || echo compile)
+}
+
+src_install() {
+ dodir /etc
+ use doc && dodir /usr/share/info
+
+ emake -j1 DESTDIR="${D}" install
+
+ # The copy in sys-apps/man-pages is more recent
+ rm -f "${ED}"/usr/share/man/man4/fd.4 || die
+
+ # Rename to match binary
+ mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
+}
diff --git a/app-misc/fdutils/metadata.xml b/app-misc/fdutils/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/fdutils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/fhem-5.8 b/app-misc/fhem-5.8
deleted file mode 100644
index 2f2db3cb7892..000000000000
--- a/app-misc/fhem-5.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=media-gfx/pngcrush
-DESCRIPTION=A GPL'd perl server for house automation
-EAPI=6
-HOMEPAGE=https://www.fhem.de/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-perl/Crypt-CBC dev-perl/Device-SerialPort dev-perl/Digest-CRC dev-perl/JSON
-SLOT=0
-SRC_URI=https://www.fhem.de/fhem-5.8.tar.gz
-_eclasses_=user 8bc2845510e2109af75e3eeac607ec81
-_md5_=64917f4f8d3f6b460d27ba25fdb1f617
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
new file mode 100644
index 000000000000..61eb71f5e033
--- /dev/null
+++ b/app-misc/fhem/Manifest
@@ -0,0 +1,5 @@
+AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765e8248e845bc3c07ae619b46e450d9b3a96a993a814e0c831a51edce6129d8efe07baee0db SHA512 9ce1c1cc2d7c55a29df2e344ad6600704e68536b734997a7cc1a73a225970c26f924c902c4d4e6f318e22a000b9b4ec2ceb52edd650fe3a8d12488b5293f7ad3
+AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
+DIST fhem-5.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
+MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.8.ebuild b/app-misc/fhem/fhem-5.8.ebuild
new file mode 100644
index 000000000000..70fd300295f7
--- /dev/null
+++ b/app-misc/fhem/fhem-5.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-perl/Crypt-CBC
+ dev-perl/Device-SerialPort
+ dev-perl/Digest-CRC
+ dev-perl/JSON"
+
+DEPEND="media-gfx/pngcrush"
+
+QA_PREBUILT="opt/fhem/contrib/lcd4linux/fritzbox_dpf/lcd4linux
+ opt/fhem/contrib/lcd4linux/rpi_dpf/lcd4linux"
+
+pkg_setup() {
+ enewgroup fhem
+ enewuser fhem -1 -1 /opt/fhem fhem
+}
+
+src_prepare() {
+ default
+
+ # Allow install path to be set by DESTDIR in Makefile
+ sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+ # Remove docs in Makefile, as they will be installed manually
+ sed -i -e 's/docs//g' Makefile || die
+ sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+ # Remove manpage in Makefile, as it will be installed manually
+ sed -i -e '/fhem.pl.1/d' Makefile || die
+
+ # Remove log dir, as it will be replaced with a symlink
+ rm -r log || die
+
+ # Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+ # Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+ pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+ cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local DOCS=(
+ "CHANGED"
+ "HISTORY"
+ "README.SVN"
+ "README_DEMO.txt"
+ "docs"/*.txt
+ "docs"/*.patch
+ "docs"/*.pdf
+ "docs/changelog"
+ "docs/copyright"
+ "docs/dotconfig"
+ "docs/fhem.odg.readme"
+ "docs/LIESMICH.update-thirdparty"
+ "docs"/README*
+ "docs/X10"
+ )
+
+ if use doc; then
+ local DOCS+=( "docs/X10" )
+ local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+ fi
+
+ diropts -o fhem -g fhem
+ keepdir "/var/lib/fhem"
+ keepdir "/var/log/fhem"
+
+ dosym ../../var/lib/fhem /opt/fhem/data
+ dosym ../../var/log/fhem /opt/fhem/log
+
+ default
+
+ newinitd "${FILESDIR}"/fhem.initd fhem
+
+ newman docs/fhem.man fhem.pl.1
+
+ echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+ doenvd "${T}"/99fhem
+
+ fowners fhem:fhem /opt/fhem/fhem.cfg
+}
diff --git a/app-misc/fhem/files/fhem.cfg b/app-misc/fhem/files/fhem.cfg
new file mode 100644
index 000000000000..04f7ae9a4681
--- /dev/null
+++ b/app-misc/fhem/files/fhem.cfg
@@ -0,0 +1,27 @@
+attr global logfile ./log/fhem-%Y-%m.log
+attr global pidfilename /run/fhem/fhem.pid
+attr global modpath .
+attr global statefile ./data/fhem.save
+attr global verbose 3
+attr global updateInBackground
+
+define telnetPort telnet 7072 global
+
+define WEB FHEMWEB 8083 global
+
+define WEBphone FHEMWEB 8084 global
+attr WEBphone stylesheetPrefix smallscreen
+
+define WEBtablet FHEMWEB 8085 global
+attr WEBtablet stylesheetPrefix touchpad
+
+# Fake FileLog entry, to access the fhem log from FHEMWEB
+define Logfile FileLog ./log/fhem-%Y-%m.log fakelog
+
+define autocreate autocreate
+attr autocreate filelog ./data/%NAME-%Y.log
+
+define eventTypes eventTypes ./data/eventTypes.txt
+
+# Disable this to avoid looking for new USB devices on startup
+define initialUsbCheck notify global:INITIALIZED usb create
diff --git a/app-misc/fhem/files/fhem.initd b/app-misc/fhem/files/fhem.initd
new file mode 100644
index 000000000000..424948719010
--- /dev/null
+++ b/app-misc/fhem/files/fhem.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+home="/opt/fhem"
+command="${home}/fhem.pl"
+command_args="${home}/fhem.cfg"
+command_group="fhem"
+command_user="fhem"
+name="FHEM"
+pidfile_path="/run/fhem"
+pidfile="${pidfile_path}/fhem.pid"
+start_stop_daemon_args="--chdir ${home}"
+
+start_pre() {
+ checkpath -d -o "${command_user}:${command_group}" -q "${pidfile_path}"
+}
diff --git a/app-misc/fhem/metadata.xml b/app-misc/fhem/metadata.xml
new file mode 100644
index 000000000000..92b432980845
--- /dev/null
+++ b/app-misc/fhem/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ FHEM is a GPL'd perl server for house automation.
+ It is used to automate some common tasks in the household like
+ switching lamps, shutters, heating and to log events like
+ temperature, humidity, power consumption.
+ In order to use FHEM you'll need some attached hardware
+ like the CUL-, EnOcean- or Z-Wave-USB-Stick to access the actors and sensors.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/figlet-2.2.5 b/app-misc/figlet-2.2.5
deleted file mode 100644
index bd2141af670f..000000000000
--- a/app-misc/figlet-2.2.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=program for making large letters out of ordinary text
-EAPI=5
-HOMEPAGE=http://www.figlet.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85a156d742fd9018ec95bc7636b64b4a
diff --git a/app-misc/figlet-2.2.5-r1 b/app-misc/figlet-2.2.5-r1
deleted file mode 100644
index 365852574cb9..000000000000
--- a/app-misc/figlet-2.2.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=program for making large letters out of ordinary text
-EAPI=6
-HOMEPAGE=http://www.figlet.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c39e297f56e8c0b128eb93f907f21c1e
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
new file mode 100644
index 000000000000..186b776836a6
--- /dev/null
+++ b/app-misc/figlet/Manifest
@@ -0,0 +1,6 @@
+AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
+AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
+DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
+EBUILD figlet-2.2.5-r1.ebuild 953 BLAKE2B 380ac3d9845a8df779daa44b6f2753105a583b8afdf5426a13d2ccf121dafe1464e50803a1f4eff8028bf7f0e6e93d39f2d43ca53d481fe2553acb34e7ea7450 SHA512 d05d18d1fb99bc3ffff5ec979b34df391e8f1a738d04e35f9dea917bfe37cec94dcfc6d3a8dd3dfcdfffbe4ccf98f5ceb85019754bbef2f93ce9b9add80bd173
+EBUILD figlet-2.2.5.ebuild 944 BLAKE2B 26363338b68fd5119a5c0fe017ec5c2f564dee3bb34294359ba2de4ba9fc955ae30baff45011e818d230e2db3f9c8370fb585852aea02431f92b3c282d856273 SHA512 7b5d84e084d4a2be3ab5410d5fd5a5f8d7045e1309ba79a22891c81dc4b057f5409d667e941c20e2cf14973067d96c99966ad1ec87721c4b950d5047236d01db
+MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..5544037f0869
--- /dev/null
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="program for making large letters out of ordinary text"
+HOMEPAGE="http://www.figlet.org/"
+SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+src_compile() {
+ emake clean
+ emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ prefix="${EPREFIX}/usr" \
+ all
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ BINDIR="${EPREFIX}/usr/bin" \
+ MANDIR="${EPREFIX}/usr/share/man" \
+ prefix="${EPREFIX}/usr" \
+ install
+
+ doman chkfont.6 figlet.6 figlist.6 showfigfonts.6
+ dodoc README figfont.txt
+
+ newbashcomp "${FILESDIR}"/figlet.bashcomp-r1 figlet
+}
diff --git a/app-misc/figlet/figlet-2.2.5.ebuild b/app-misc/figlet/figlet-2.2.5.ebuild
new file mode 100644
index 000000000000..fe9880b239ed
--- /dev/null
+++ b/app-misc/figlet/figlet-2.2.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="program for making large letters out of ordinary text"
+HOMEPAGE="http://www.figlet.org/"
+SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+src_compile() {
+ emake clean
+ emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ prefix="${EPREFIX}/usr" \
+ all
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ BINDIR="${EPREFIX}/usr/bin" \
+ MANDIR="${EPREFIX}/usr/share/man" \
+ prefix="${EPREFIX}/usr" \
+ install
+
+ doman chkfont.6 figlet.6 figlist.6 showfigfonts.6
+ dodoc README figfont.txt
+
+ dobashcomp "${FILESDIR}"/figlet.bashcomp
+}
diff --git a/app-misc/figlet/files/figlet.bashcomp b/app-misc/figlet/files/figlet.bashcomp
new file mode 100644
index 000000000000..be3762ceb7e0
--- /dev/null
+++ b/app-misc/figlet/files/figlet.bashcomp
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# bash command-line completion for figlet
+# author: Aaron Walker <ka0ttic@gentoo.org>
+
+_figlet() {
+ local cur prev opts x
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-f -d -c -l -r -x -t -w -p -n -D -E -C -N -s -S -k -W -o \
+ -m -v -I -L -R -X"
+
+ if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- $cur) )
+ return 0
+ fi
+
+ case "${prev}" in
+ -f)
+ COMPREPLY=( $(compgen -f -- $cur) \
+ $(compgen -W "$(\
+ for x in /usr/share/figlet/*.flf ; do \
+ [[ -f ${x} ]] && { local y=${x##*/} ; echo ${y%.*} ; } \
+ done)" -- $cur) )
+ ;;
+ -d)
+ COMPREPLY=( $(compgen -d -S '/' -- $cur) )
+ ;;
+ -C)
+ COMPREPLY=( $(compgen -f -- $cur) \
+ $(compgen -W "$(\
+ for x in /usr/share/figlet/*.flc ; do \
+ [[ -f ${x} ]] && { local y=${x##*/} ; echo ${y%.*} ; } \
+ done)" -- $cur) )
+ ;;
+ -m)
+ COMPREPLY=( $(compgen -W "$(\
+ for ((x = 1 ; x < 64 ; x++)) ; do \
+ echo ${x} ; \
+ done)" ) )
+ ;;
+ -I)
+ COMPREPLY=( $(compgen -W "-1 0 1 2 3 4" -- $cur) )
+ ;;
+ esac
+}
+complete -o filenames -F _figlet figlet
+
+# vim: set ft=sh tw=80 sw=4 et :
diff --git a/app-misc/figlet/files/figlet.bashcomp-r1 b/app-misc/figlet/files/figlet.bashcomp-r1
new file mode 100644
index 000000000000..cf224dbde3f1
--- /dev/null
+++ b/app-misc/figlet/files/figlet.bashcomp-r1
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# bash command-line completion for figlet
+# author: Aaron Walker <ka0ttic@gentoo.org>
+
+_figlet() {
+ local cur prev opts x
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-f -d -c -l -r -x -t -w -p -n -D -E -C -N -s -S -k -W -o \
+ -m -v -I -L -R -X"
+
+ if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- $cur) )
+ return 0
+ fi
+
+ case "${prev}" in
+ -f)
+ COMPREPLY=( $(compgen -f -- $cur) \
+ $(compgen -W "$(\
+ for x in /usr/share/figlet/*.flf ; do \
+ [[ -f "${x}" ]] && { local y=${x##*/} ; echo ${y%.*} ; } \
+ done)" -- $cur) )
+ ;;
+ -d)
+ _filedir -d
+ ;;
+ -C)
+ COMPREPLY=( $(compgen -f -- $cur) \
+ $(compgen -W "$(\
+ for x in /usr/share/figlet/*.flc ; do \
+ [[ -f "${x}" ]] && { local y=${x##*/} ; echo ${y%.*} ; } \
+ done)" -- $cur) )
+ ;;
+ -m)
+ COMPREPLY=( $(compgen -W "$(\
+ for ((x = 1 ; x < 64 ; x++)) ; do \
+ echo ${x} ; \
+ done)" ) )
+ ;;
+ -I)
+ COMPREPLY=( $(compgen -W "-1 0 1 2 3 4" -- $cur) )
+ ;;
+ esac
+}
+complete -o filenames -F _figlet figlet
+
+# vim: set ft=sh tw=80 sw=4 et :
diff --git a/app-misc/figlet/metadata.xml b/app-misc/figlet/metadata.xml
new file mode 100644
index 000000000000..fed47a353275
--- /dev/null
+++ b/app-misc/figlet/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type='person'>
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/flirc-3.11.6 b/app-misc/flirc-3.11.6
deleted file mode 100644
index 447e9ca41658..000000000000
--- a/app-misc/flirc-3.11.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Allows you to pair any remote control with your computer or media center
-EAPI=6
-HOMEPAGE=https://flirc.tv/
-IUSE=+qt5
-KEYWORDS=-* ~amd64 ~arm
-LICENSE=all-rights-reserved
-RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://packagecloud.io/Flirc/repo/packages/ubuntu/artful/flirc_3.11.6_amd64.deb/download.deb -> flirc-3.11.6_amd64.deb ) arm? ( https://packagecloud.io/Flirc/repo/packages/debian/stretch/flirc_3.11.6_armhf.deb/download.deb -> flirc-3.11.6_armhf.deb )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 unpacker 87633b2194cdb56adaa1f5a5c8862c44
-_md5_=bfaf6c6aca5976790a5c289f9acb7656
diff --git a/app-misc/flirc/Manifest b/app-misc/flirc/Manifest
new file mode 100644
index 000000000000..62d5c7bc73da
--- /dev/null
+++ b/app-misc/flirc/Manifest
@@ -0,0 +1,4 @@
+DIST flirc-3.11.6_amd64.deb 8994136 BLAKE2B 0dfcf230daee195a844aaf746e8f1cd259eb9b3eb7203483040c3b0c7ef2d7eded09064ed6dd30e3f72568f59dbddf3d96c5b26a84cad5f9e2e464c7e114e4bf SHA512 06dfb22653dac1efe3e67eab8b2806a4760f4b3646a712222658d48cfb3defe3abb9f5fe8a0bfbb8dfc332a0f4e89691c304402d3d5ea28328bd5b6619069ece
+DIST flirc-3.11.6_armhf.deb 10631794 BLAKE2B c5ae5934cab825cb01ee1c92d48d1ee7867a318a029f3e60c8112cf887495d8bd7cbf9138836c7c42ab50174ec01b8d38fd51c963743e0939b4dca05c458d678 SHA512 3e7c9461827db8e3156002ea3119dc34fc00476d7df009e0484e77afee52b5ad58133da16d4017aa9d25890b5098615f70b36a4b5b18d77dc06fe6be19f1b6c0
+EBUILD flirc-3.11.6.ebuild 1186 BLAKE2B 22db59ad36e612ad25955140521c0d3d3297681e3c335c5d649f72abc5ff8b0eaa4c49c938c9bf1f160ef04e44a3c166f546be9ca3f1d0b9fc7de58d3875edda SHA512 5b6554f7e3dbd97a7b5e09d42784d1e3528fb14240187621b5f093ff3f1d5996a9c6e4357851722f1bc92bb7b18dfb9234c4a49106591d33a1e2bd762c3d4a36
+MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/app-misc/flirc/flirc-3.11.6.ebuild b/app-misc/flirc/flirc-3.11.6.ebuild
new file mode 100644
index 000000000000..7f983650ab46
--- /dev/null
+++ b/app-misc/flirc/flirc-3.11.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop udev unpacker
+
+DESCRIPTION="Allows you to pair any remote control with your computer or media center"
+HOMEPAGE="https://flirc.tv/"
+SRC_URI="
+ amd64? ( https://packagecloud.io/Flirc/repo/packages/ubuntu/artful/flirc_${PV}_amd64.deb/download.deb -> ${P}_amd64.deb )
+ arm? ( https://packagecloud.io/Flirc/repo/packages/debian/stretch/flirc_${PV}_armhf.deb/download.deb -> ${P}_armhf.deb )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm"
+IUSE="+qt5"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+DEPEND=""
+RDEPEND="virtual/libusb:1
+ dev-libs/hidapi
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5 )"
+
+QA_PREBUILT="/usr/bin/*"
+
+src_install () {
+ udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
+ doman usr/share/doc/flirc/flirc_util.1
+ dobin usr/bin/flirc_util
+ if use qt5 ; then
+ doman usr/share/doc/flirc/Flirc.1
+ dobin usr/bin/Flirc
+ doicon usr/share/pixmaps/Flirc.png
+ domenu usr/share/applications/Flirc.desktop
+ fi
+}
diff --git a/app-misc/flirc/metadata.xml b/app-misc/flirc/metadata.xml
new file mode 100644
index 000000000000..9344dda7b30f
--- /dev/null
+++ b/app-misc/flirc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gentoo@k8n.de</email>
+ <name>Daniel Kenzelmann</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Gentoo Proxy Maintainers Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/freemind-1.0.1-r3 b/app-misc/freemind-1.0.1-r3
deleted file mode 100644
index c19c9300fdcb..000000000000
--- a/app-misc/freemind-1.0.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.9 dev-java/fop:0 ) svg? ( dev-java/batik:1.9 dev-java/fop:0 ) >=virtual/jdk-1.6 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Mind-mapping software written in Java
-EAPI=5
-HOMEPAGE=http://freemind.sourceforge.net
-IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.9 dev-java/fop:0 ) svg? ( dev-java/batik:1.9 dev-java/fop:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0df7525279b5f762f28253cb56571fe8
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
new file mode 100644
index 000000000000..d35f3a873cbd
--- /dev/null
+++ b/app-misc/freemind/Manifest
@@ -0,0 +1,3 @@
+DIST freemind-src-1.0.1.tar.gz 31617138 BLAKE2B 0bc7bd0657d503a4b94f6b3fc1fe0364dee54e1899f0f06e4e245b30a817e0b632bce39aa17fbbc597c6780e0e063db3bf52eaf72fb2d6cb59483775b4babaa0 SHA512 f3b7bd526da3075e883292fc88dd5b01f5b0112c58cfeae25a6be9c7dbf4a5444839821e3e2554303032d832b4520fa742894c09ded2705270f51aca98167fb5
+EBUILD freemind-1.0.1-r3.ebuild 3041 BLAKE2B 3d6f1003f1761ac9a1b841e0ff1d62c0501819cfb855a240621f0459232874698ae2f055cf877740b4d21460ad057722a1536f016c553e0266c25551d7abd127 SHA512 5b637ec3cc9c36d0a9466d47b0bbc9f355d492d09bbc6457ab9fc0fb87c8665a17309f323f3711713c4b0b411257f371832a1afa1164b6126232cd95b76ac6e6
+MISC metadata.xml 643 BLAKE2B d2472be823a6955c3ca8ad3b866d370b3eca33053cece2eb942177a77792b0da9164f386994ef62d21203281eb48a9ecb3a6d1f5d3d0ccbd36a14ef6293149c3 SHA512 2075eb39f587784119d83827cd4614dab2146bac37440ed3b8430fcb29fb4b0a1f53470e72f64ba875908e0b64a894074627e7beb6aa5d29d1893afa47445788
diff --git a/app-misc/freemind/freemind-1.0.1-r3.ebuild b/app-misc/freemind/freemind-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..6a412d2e8a82
--- /dev/null
+++ b/app-misc/freemind/freemind-1.0.1-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Mind-mapping software written in Java"
+HOMEPAGE="http://freemind.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="groovy latex pdf svg"
+
+CDEPEND="
+ dev-java/javahelp:0
+ dev-java/jgoodies-forms:0
+ dev-java/jibx:0
+ dev-java/jortho:0
+ >=dev-java/simplyhtml-0.13.1:0
+ groovy? ( dev-java/groovy )
+ latex? ( dev-java/hoteqn:0 )
+ pdf? (
+ dev-java/batik:1.9
+ dev-java/fop:0
+ )
+ svg? (
+ dev-java/batik:1.9
+ dev-java/fop:0
+ )"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ pdf? ( dev-java/avalon-framework:4.2 )
+ svg? ( dev-java/avalon-framework:4.2 )"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+ chmod +x check_for_duplicate_resources.sh || die
+
+ # someone got it all wrong (set/unset vs. bool)
+ sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
+
+ # disable dmg build on Mac OS X
+ sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
+
+ use groovy || rm plugins/build_scripting.xml || die
+ use latex || rm plugins/build_latex.xml || die
+ use pdf || use svg || rm plugins/build_svg.xml || die
+ # not compatible with releases of jmapviewer
+ rm plugins/build_map.xml || die
+
+ rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
+}
+
+src_configure() {
+ local build_files=( $(find "${S}" -name 'build*.xml') )
+ JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
+ JAVA_ANT_REWRITE_CLASSPATH="yes"
+ JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+ JAVA_ANT_ENCODING="utf-8"
+ java-ant-2_src_configure
+}
+
+src_compile() {
+ local svg_deps svg_build_deps
+ if use pdf || use svg; then
+ svg_deps="batik-1.9,fop"
+ svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
+ fi
+ EANT_GENTOO_CLASSPATH="
+ jgoodies-forms,jibx,javahelp,jortho,simplyhtml
+ $(usex groovy groovy '')
+ $(usex latex hoteqn '')
+ ${svg_deps}"
+ EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
+ EANT_BUILD_TARGET="dist"
+ EANT_DOC_TARGET="doc"
+ EANT_ANT_TASKS="jibx"
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ cd "${WORKDIR}"/bin/dist || die
+ local dest="/usr/share/${PN}/"
+
+ java-pkg_dojar lib/*.jar
+
+ if use doc; then
+ java-pkg_dojavadoc doc/javadoc
+ rm -r doc/javadoc
+ fi
+
+ insinto "${dest}"
+ doins -r accessories browser doc plugins patterns.xml
+
+ # register plugins for java-dep-check
+ local plugins="help"
+ use groovy && plugins+=" script"
+ use latex && plugins+=" latex"
+ if use pdf || use svg; then
+ plugins+=" svg"
+ fi
+ local plugin
+ for plugin in ${plugins}; do
+ java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
+ done
+
+ java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
+ --pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
+
+ newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
+
+ make_desktop_entry freemind Freemind freemind Utility
+}
diff --git a/app-misc/freemind/metadata.xml b/app-misc/freemind/metadata.xml
new file mode 100644
index 000000000000..7218d43e0873
--- /dev/null
+++ b/app-misc/freemind/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <use>
+ <flag name="groovy">Build plugin for scripting via Groovy</flag>
+ <flag name="latex">Build plugin for inserting mathematical formulas in LaTeX syntax</flag>
+ <flag name="pdf">Build plugin for exporting mindmaps to SVG and PDF</flag>
+ <flag name="svg">Build plugin for exporting mindmaps to SVG and PDF</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">freemind</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/freeplane-1.5.18 b/app-misc/freeplane-1.5.18
deleted file mode 100644
index 433276bbf53c..000000000000
--- a/app-misc/freeplane-1.5.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=virtual/jdk-1.8 dev-java/gradle-bin test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Java application for Mind Mapping, Knowledge and Project Management
-EAPI=6
-HOMEPAGE=https://www.freeplane.org/
-IUSE=elibc_FreeBSD test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=mirror://sourceforge/freeplane/freeplane%20stable/freeplane_src-1.5.18.tar.gz https://dev.gentoo.org/~xmw/distfiles/freeplane-1.5.18-gradle-cache.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=d1ce7ae4a4bea4539c1a78930bfd5376
diff --git a/app-misc/freeplane/Manifest b/app-misc/freeplane/Manifest
new file mode 100644
index 000000000000..4884e223a3de
--- /dev/null
+++ b/app-misc/freeplane/Manifest
@@ -0,0 +1,4 @@
+DIST freeplane-1.5.18-gradle-cache.tar.xz 23290912 BLAKE2B 4f346d408a999a50a5f2ccb3170bb614d21c24347382524a716e6548be521953679fd0d582ddb5024de77a05de915d929998097711f2b1bc11e3cc5edb1f0de3 SHA512 db9fa368c829b7cffad0aa863823e75efe06be0c7b8480f3be3bfe53adac28a6f1d51a8b0bb91958eecafd1dd61d81c0ef15193ba4e20ebe87f55450b599aece
+DIST freeplane_src-1.5.18.tar.gz 13233435 BLAKE2B 07080abeda3fd2dea3aba4b093d759931a57eb55b010b7d4f69e1f007318c3c2dc08f676f8e990898a8f1ffe130574a02579987f4493562ec824ee3bba3aa162 SHA512 c7feaf957e1d67cb8e71e0b8aa1193c291b5cbc482f932397baeb8f296062378864e5004b59740d716b5c833b5404732ce17d7551ab0a3b663d3fda44327bccb
+EBUILD freeplane-1.5.18.ebuild 1346 BLAKE2B 8447a18a7a42f5989d28894f3d77522437a9384d3ab8da184e89242f841863cffa34e0b167ed1df63a41179feef9ecc517da0aa40f9e881180349c33ea679ffd SHA512 d2508c040c5cac008ae2be86b7bf9164a7711bdc837f748f3f9121cc190d577540414b8de9b586be65a88e0afd22944a0e0210f845866dfc3fb4bcd8feaac082
+MISC metadata.xml 624 BLAKE2B c4ff6c7d6685707393ad73269ee24c1358b9a4b2b8a1fed08f42daaffc07dffdbe7f4b3c8cda08d04689bd29b905640682d1c5f96c4d01ab9dcff1ee3791d6b1 SHA512 6f1492a2425291717a9f01e06e0480b3ee04fe566b0f5506f102fef49a34e3f2421a8471e6801f50f531e13d1781c68f0c45724fa9d8e52c98d0d33e3b04fb20
diff --git a/app-misc/freeplane/freeplane-1.5.18.ebuild b/app-misc/freeplane/freeplane-1.5.18.ebuild
new file mode 100644
index 000000000000..fdec42967700
--- /dev/null
+++ b/app-misc/freeplane/freeplane-1.5.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc"
+
+VIRTUALX_REQUIRED="test"
+
+inherit java-utils-2 virtualx
+
+DESCRIPTION="Java application for Mind Mapping, Knowledge and Project Management"
+HOMEPAGE="https://www.freeplane.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}%20stable/${PN}_src-${PV}.tar.gz
+ https://dev.gentoo.org/~xmw/distfiles/freeplane-1.5.18-gradle-cache.tar.xz"
+#generate cache file by disabling --offline, ebuild clean test and
+#tar cvJf /var/cache/distfiles/freeplane-1.5.18-gradle-cache.tar.xz -C /var/tmp/portage/app-misc/freeplane-1.5.18/work .gradle/caches/modules-2
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="${DEPEND}
+ >=virtual/jdk-1.8
+ dev-java/gradle-bin"
+
+src_compile() {
+ GRADLE="gradle --gradle-user-home ${WORKDIR}/.gradle --console rich --no-daemon"
+ GRADLE="${GRADLE} --offline"
+ ${GRADLE} build -x check -x test || die
+}
+
+src_test() {
+ virtx ${GRADLE} check test || die
+}
+
+src_install() {
+ cd BUILD || die
+ sed -e "/freepath=/s:=.*:=${EROOT}usr/share/${PN}:" \
+ -i freeplane.sh
+ newbin freeplane.sh freeplane
+
+ insinto /usr/share/${PN}
+ doins framework.jar freeplanelauncher.jar \
+ freeplane.policy props.xargs init.xargs *.l4j.ini
+ doins -r core doc fwdir plugins resources
+}
diff --git a/app-misc/freeplane/metadata.xml b/app-misc/freeplane/metadata.xml
new file mode 100644
index 000000000000..14c857935b2c
--- /dev/null
+++ b/app-misc/freeplane/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <longdescription lang="en">
+Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">freeplane</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/fslint-2.46 b/app-misc/fslint-2.46
deleted file mode 100644
index 928830eb1466..000000000000
--- a/app-misc/fslint-2.46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=nls? ( sys-devel/gettext:* )
-DESCRIPTION=A utility to find various forms of lint on a filesystem
-EAPI=6
-HOMEPAGE=http://www.pixelbeat.org/fslint/
-IUSE=nls python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/libglade:2.0
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.pixelbeat.org/fslint/fslint-2.46.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d584da5dd805813e14b99e69296afe6
diff --git a/app-misc/fslint/Manifest b/app-misc/fslint/Manifest
new file mode 100644
index 000000000000..deba3163ea2c
--- /dev/null
+++ b/app-misc/fslint/Manifest
@@ -0,0 +1,3 @@
+DIST fslint-2.46.tar.xz 135988 BLAKE2B e4cd1187222f9a959c23ea0606263489d6cd52ae1e2f0f4fd4ac859fc516073f3d5186e7bc77a782ab1a698db182e7082333020b25a8f5a705bd1265d99e7ba4 SHA512 7b6122b5920d37548cfb05bb986cc29a86c7de9f549375923299c23fe19cbc8c6a521feafcf6df6fe0562dae8b6a4e804f24fdf5a833ea2b68308be41a96b696
+EBUILD fslint-2.46.ebuild 2137 BLAKE2B 5dbf48e8c1d655c5d8d6b40b18657fabe18e7e36bd9e6e44ca75c08313fff06198ec43c55da82280fa158bb188e017a5daee6cf6932fd31f21082cac1fc2fe80 SHA512 b8244fbd2c91a810bca8b29a63d0a3fbfe9eec21934682d89989b1d7569338cf2b9ff8f266808b2bf7bdd4d0ebf23a416b1ffa9bd1c1a4066fd72790f68f7902
+MISC metadata.xml 250 BLAKE2B 4e66f9af5f8e38f419fa14400bb846409e25a994b97c5ea4576b86ae5b601776c81fccbea03201d3414f9eb32cd0d12afee9babdb5e864338b1a86bfdbfa5cce SHA512 aba0ad6bb553b7f17cc5865b37e6ab4d7cb932b9384937bd8e2c8b254f9ba39afa3b1df70b83974c58076339fbf62b60f26d69f789e349f02b1d89dea299ce3a
diff --git a/app-misc/fslint/fslint-2.46.ebuild b/app-misc/fslint/fslint-2.46.ebuild
new file mode 100644
index 000000000000..6e119a86e0a1
--- /dev/null
+++ b/app-misc/fslint/fslint-2.46.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+# The eutils eclass is still needed for doicon() and domenu().
+inherit eutils python-r1
+
+DESCRIPTION="A utility to find various forms of lint on a filesystem"
+HOMEPAGE="http://www.pixelbeat.org/fslint/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ gnome-base/libglade:2.0"
+
+DEPEND="nls? ( sys-devel/gettext:* )"
+
+src_prepare() {
+ default
+
+ # Change some paths to make ${PN}-gui run with our filesystem layout.
+ # These commands are taken from the debian/rules file.
+ sed -e "s:^liblocation=.*$:liblocation='${EROOT}usr/share/${PN}':" \
+ -e "s:^locale_base=.*$:locale_base=None:" \
+ -i "${PN}-gui" \
+ || die "failed to fix liblocation and locale_base in ${PN}-gui"
+}
+
+src_install() {
+ # The commands below roughly follow debian/rules.
+ python_foreach_impl python_doscript "${PN}-gui"
+
+ insinto "/usr/share/${PN}"
+ doins "${PN}.glade" "${PN}_icon.png"
+
+ exeinto "/usr/share/${PN}/${PN}"
+ doexe "${PN}"/find*
+ doexe "${PN}/${PN}"
+ doexe "${PN}/zipdir"
+
+ exeinto "/usr/share/${PN}/${PN}/fstool"
+ doexe "${PN}/fstool/dir_size" "${PN}/fstool/edu" "${PN}/fstool/lS"
+ python_scriptinto "/usr/share/${PN}/${PN}/fstool"
+ python_foreach_impl python_doscript "${PN}/fstool/dupwaste"
+
+ exeinto "/usr/share/${PN}/${PN}/supprt"
+ doexe "${PN}"/supprt/get*
+
+ python_scriptinto "/usr/share/${PN}/${PN}/supprt"
+ python_foreach_impl python_doscript "${PN}/supprt/md5sum_approx"
+
+ doexe "${PN}/supprt/fslver"
+
+ exeinto "/usr/share/${PN}/${PN}/supprt/rmlint"
+ doexe "${PN}"/supprt/rmlint/*.sh
+ python_scriptinto "/usr/share/${PN}/${PN}/supprt/rmlint"
+ python_foreach_impl python_doscript "${PN}/supprt/rmlint/fixdup"
+ python_foreach_impl python_doscript "${PN}/supprt/rmlint/merge_hardlinks"
+
+ doicon "${PN}_icon.png"
+ domenu "${PN}.desktop"
+
+ dodoc doc/{FAQ,NEWS,README,TODO}
+ doman man/*.1
+
+ if use nls; then
+ cd po || die
+ emake DESTDIR="${D}" install
+ fi
+}
diff --git a/app-misc/fslint/metadata.xml b/app-misc/fslint/metadata.xml
new file mode 100644
index 000000000000..6e883e5321c1
--- /dev/null
+++ b/app-misc/fslint/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">pixelb/fslint</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/fslurp-2.1.4 b/app-misc/fslurp-2.1.4
deleted file mode 100644
index cc93a7ee5ef4..000000000000
--- a/app-misc/fslurp-2.1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Read and display data from Fronius IG and IG Plus inverters
-EAPI=5
-HOMEPAGE=http://fslurp.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/fslurp/fslurp-2.1.4.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0836a241eb758083fcd9b8e1bca7037
diff --git a/app-misc/fslurp/Manifest b/app-misc/fslurp/Manifest
new file mode 100644
index 000000000000..e4dbb796b7b4
--- /dev/null
+++ b/app-misc/fslurp/Manifest
@@ -0,0 +1,4 @@
+AUX fslurp-2.1.4-makefile.patch 1017 BLAKE2B 43d74e9a146b5a752b827b725d23617ddb208cb0f18c5571c1a08e6a166cddc9daaf9f35b9a6f3aee494c1b6226062d653868555263c84b421f4b5a0fb155071 SHA512 87bdfc820f9b50bc155933e2dbafe94a0e66162516787ec4ef9be7ded578cc919ed22b5e9728965eba77471a1b79b64be459ebfe9efd9d16aa4af1bd3d74403f
+DIST fslurp-2.1.4.tgz 33524 BLAKE2B bcc79b73eaf1efe98805c416f3eed0af8d4848e8867608f09f14f6cba78e247e6fa5d34b310a8a0f9d1816f03a677c14f5648a00f97c55703e974c9edf6356a6 SHA512 db209da30735de88245b5a79b65e441a426c793464a8607231156e9a5bea47884edbdf16e5ef83eaed6a4212835d0cac763ed0ed012d06757d2902ef01d88c6e
+EBUILD fslurp-2.1.4.ebuild 519 BLAKE2B 3044522e9b4d69ca5f29a5d1373c0e8d0364679154efe5c2e68c7df6c8c70c642fe75379d8664c691f671d0db7062c3adaaf107b3153642797f5faa1c7cef580 SHA512 e3a57a79da20e739259c16ce56a5c73dbfaf7a5175da8889b0651060bef7e55879a3e453c0753cfb7579a710e92cfa149176569ac4470e2364bd7f6915e41d04
+MISC metadata.xml 574 BLAKE2B 4b73e735fbf07b150fa30394998ecd45ba6ad8c8922f3068134e114b695ea31cc0cc95d259c6c62c2b9dfd46083f546424d46bd602d150ae28473345349627af SHA512 3448d23525dd7ea5bb0fd57625cc38759098a3a7ed3f428cc5d94003fa18e0d861b369120f3e616fcc98b9253c42d795e5e28e709676bc5136406230e8b69822
diff --git a/app-misc/fslurp/files/fslurp-2.1.4-makefile.patch b/app-misc/fslurp/files/fslurp-2.1.4-makefile.patch
new file mode 100644
index 000000000000..f231c170a4a2
--- /dev/null
+++ b/app-misc/fslurp/files/fslurp-2.1.4-makefile.patch
@@ -0,0 +1,47 @@
+--- fslurp-2.1.4/Makefile
++++ fslurp-2.1.4/Makefile
+@@ -51,35 +51,35 @@
+ INCLUDES = fslurp.h fronius.h
+ SIMINCLUDES = simulator.h
+
+-DEBUGFLAGS = -g
+-CFLAGS = -c -Wall $(DEBUGFLAGS)
++#DEBUGFLAGS = -g
++CFLAGS += -c -Wall $(DEBUGFLAGS)
+
+-LDFLAGS = -lm
++LIBS = -lm
+
+ VERSION := fslurp-$(shell tail -1 version)
+
+ all: $(TARGETS)
+
+ fslurp: $(FSLURP_OBJS)
+- $(CC) $(LDFLAGS) $^ -o $@
++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+
+ simSolarNet2i1s: \
+ $(SIMSOLARNET2I1S_OBJS)
+- $(CC) $(LDFLAGS) $^ -o $@
++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+
+ simSolarNet1i0s: \
+ $(SIMSOLARNET1I0S_OBJS)
+- $(CC) $(LDFLAGS) $^ -o $@
++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+
+ simSolarNet0i0s: \
+ $(SIMSOLARNET0I0S_OBJS)
+- $(CC) $(LDFLAGS) $^ -o $@
++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+
+ simIFCEasy: $(SIMIFCEASY_OBJS)
+- $(CC) $(LDFLAGS) $^ -o $@
++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+
+ sim422IGTL: $(SIM422IGTL_OBJS)
+- $(CC) $(LDFLAGS) $^ -o $@
++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+
+ test: $(TARGETS) clean
+ ./testcase.sh
diff --git a/app-misc/fslurp/fslurp-2.1.4.ebuild b/app-misc/fslurp/fslurp-2.1.4.ebuild
new file mode 100644
index 000000000000..b1e3a45e6a79
--- /dev/null
+++ b/app-misc/fslurp/fslurp-2.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Read and display data from Fronius IG and IG Plus inverters"
+HOMEPAGE="http://fslurp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+ emake CC="$(tc-getCXX)"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc History README TODO
+}
diff --git a/app-misc/fslurp/metadata.xml b/app-misc/fslurp/metadata.xml
new file mode 100644
index 000000000000..43980587e9e8
--- /dev/null
+++ b/app-misc/fslurp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <longdescription lang="en">
+ fslurp is a program to pull the data from a Fronius Interface Card easy
+ that works with most Fronius IG and IG Plus inverters. It supports both
+ human-readable output and delimited (CSV-style) output.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">fslurp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/fsniper-1.3.1-r2 b/app-misc/fsniper-1.3.1-r2
deleted file mode 100644
index 400b2c69a3e0..000000000000
--- a/app-misc/fsniper-1.3.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/libpcre sys-apps/file >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Monitors a given set of directories for new files
-EAPI=6
-HOMEPAGE=https://github.com/l3ib/fsniper
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre sys-apps/file
-SLOT=0
-SRC_URI=http://projects.l3ib.org/fsniper/files/fsniper-1.3.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=00086a5563cac8a43fa167345562f484
diff --git a/app-misc/fsniper/Manifest b/app-misc/fsniper/Manifest
new file mode 100644
index 000000000000..afebcc477c23
--- /dev/null
+++ b/app-misc/fsniper/Manifest
@@ -0,0 +1,6 @@
+AUX fsniper-1.3.1-format-security.patch 992 BLAKE2B 80076b40a7a45196790b7d647a344b8edd75a2eaf625d81d08c77aa920c97f0abd828ccd6988b7c5384437e1beb0f0d49b183052ec18f1cb29dd975693a2fea5 SHA512 1956600123b92f76b1cf94a3867e5671c08876e5d16e211141725ab81f95a0b4ea48bc9f80e3f55bb658055c43cc3b0df42870ee53301adf5db7d5310e39092b
+AUX fsniper-1.3.1-umask.patch 663 BLAKE2B c40d6bee00d3481a1f7c3b03d225e3fbc5d9fb6b1990f613b16bebdb9cd66496e875f96aa927a6ad0229181295f6be41c51fd50f5c6f547e283ed732fa9bb89d SHA512 8532ff2624355fb4e3057442190416b02c9c8f03629ab23def757e122e411673a1826c5a6e8495007e38258bb453fa88af516a6e6b9dd56e8fc8a6a991cf371d
+AUX fsniper-1.3.1-waitpid.patch 374 BLAKE2B bed80e71fa3b52ccf2b62e208077c16f601156d165fca74c5da698693a185134cef98b07521e7103d8ab17826c77921dbbea196c193b04009e8a09dabd13dc4c SHA512 f38ab368b2e7abb1a46a047cca66ecbbff6d63e4239a96b9f04e1774d88719dff79a16c347f0ee13c06137f10a4f5773e7088ebdeafa782e1e0488674f41b00c
+DIST fsniper-1.3.1.tar.gz 282700 BLAKE2B 6c22e72e41489aa84b618892713c24cba41b8cccfe6e8eb5ddc498ca83836b179f7e602f311b6375027fd23678fdc5bb6ff5b9c6e5f2cf0c7f0488365543bcc3 SHA512 285b56ca239fb9c2c0319c8c5d24e368cda89d547bae25f69b528167c6fa5ebaab31f7fa178cb6b02735168043150605724ac14cc65e7347c6e49e2dc1e5ba87
+EBUILD fsniper-1.3.1-r2.ebuild 656 BLAKE2B c6386c590dfe6b2d41dfc6e3b3bd011bf95e6ca8f746d04116bf12ff6f529e0f2b8e1221e80b3c5412629f63850714825eaa30e45dafe4438ddde98f7643a08d SHA512 9506739bf2c87f5bc26a226f22f2b7668fcb6ad7d1b49e860f430ff01b80e89b46b52ed83290c57e4b781e23b09a1cf8a0cbae3ace7d5e8fbca6c90e6849d8d7
+MISC metadata.xml 352 BLAKE2B a11595cf78c603a0340dcfc8277c1b3f9d5fcdd45adf9d2b3c0eeea000d8e3057af641ac69a497bcf1e6795ff7c2f27eda24d13e207eec7f48d35a38f5689cb5 SHA512 03ad4670d0169a04bf038deca3fbe594d487168ef110914541a74c4f97f958bf112411143dfa7c22856f65e37a645ec6ab4be038aa3108d15416c3a264723da9
diff --git a/app-misc/fsniper/files/fsniper-1.3.1-format-security.patch b/app-misc/fsniper/files/fsniper-1.3.1-format-security.patch
new file mode 100644
index 000000000000..70c9460f97d2
--- /dev/null
+++ b/app-misc/fsniper/files/fsniper-1.3.1-format-security.patch
@@ -0,0 +1,26 @@
+From d15abeb19d1692698e0ec8a9f4a764a210e57a2b Mon Sep 17 00:00:00 2001
+From: Jakub Hrozek <jhrozek@redhat.com>
+Date: Tue, 3 Dec 2013 10:50:29 +0100
+Subject: [PATCH] Fix an error message
+
+This patch fixes https://bugzilla.redhat.com/show_bug.cgi?id=1037073
+---
+ src/handle_event.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/handle_event.c b/src/handle_event.c
+index 22f35f10ea3a6083c2ef933f794b529b8879a1ed..cac004b76917c192ad9bf8801062d701e4dc18c6 100644
+--- a/src/handle_event.c
++++ b/src/handle_event.c
+@@ -313,7 +313,7 @@ void handle_event(struct inotify_event* event, int writefd)
+ if (sysret == 127)
+ {
+ temp = malloc(27 + strlen(handler->value) + 20 + 1);
+- sprintf("Could not execute handler \"%s\", trying next one.\n", handler->value);
++ sprintf(temp, "Could not execute handler \"%s\", trying next one.\n", handler->value);
+ write_out(writefd, temp);
+
+ free(temp);
+--
+1.8.4.2
+
diff --git a/app-misc/fsniper/files/fsniper-1.3.1-umask.patch b/app-misc/fsniper/files/fsniper-1.3.1-umask.patch
new file mode 100644
index 000000000000..39aecaa3e0d1
--- /dev/null
+++ b/app-misc/fsniper/files/fsniper-1.3.1-umask.patch
@@ -0,0 +1,18 @@
+X-Git-Url: http://code.l3ib.org/?p=fsniper.git;a=blobdiff_plain;f=src%2Fmain.c;fp=src%2Fmain.c;h=cd49dffebe4b4c728b62c28c1381c4fb6f5ad87d;hp=03a8d701d6f9802ba346b591429e58741ca53479;hb=82cb0b46c48485fd4f6231ce3169c7be87d1ea07;hpb=2bbeb5d6e6b55bb9692c043fcdbeab15d9723c9e
+
+diff --git a/src/main.c b/src/main.c
+index 03a8d70..cd49dff 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -153,7 +153,10 @@ char *get_pid_filename()
+ void write_pid_file(char *pidfilename)
+ {
+ FILE *pidfile;
++ mode_t umask_old;
++ umask_old = umask(0177);
+ pidfile = fopen(pidfilename, "w");
++ umask(umask_old);
+ fprintf(pidfile, "%d", getpid());
+ fclose(pidfile);
+ }
+
diff --git a/app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch b/app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch
new file mode 100644
index 000000000000..1363c4cbf73f
--- /dev/null
+++ b/app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch
@@ -0,0 +1,15 @@
+Replace obsolete wait3 by waitpid
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -193,8 +193,8 @@
+ /* handler for reaping children after the fork is done. */
+ void handle_child_signal()
+ {
+- union wait status;
+- while (wait3(&status, WNOHANG, 0) > 0) {}
++ int status;
++ while (waitpid(-1, &status, WNOHANG) > 0) {}
+ }
+
+ /* handler for HUP. reloads the config file. */
diff --git a/app-misc/fsniper/fsniper-1.3.1-r2.ebuild b/app-misc/fsniper/fsniper-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..7b845d7f9bf8
--- /dev/null
+++ b/app-misc/fsniper/fsniper-1.3.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Monitors a given set of directories for new files"
+HOMEPAGE="https://github.com/l3ib/fsniper"
+SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+ dev-libs/libpcre
+ sys-apps/file"
+
+RDEPEND="
+ ${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-umask.patch
+ "${FILESDIR}"/${P}-waitpid.patch
+)
+
+DOCS=( AUTHORS COPYING NEWS README example.conf )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/fsniper/metadata.xml b/app-misc/fsniper/metadata.xml
new file mode 100644
index 000000000000..c1c4c23f9f38
--- /dev/null
+++ b/app-misc/fsniper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">l3ib/fsniper</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/fujiplay-1.33 b/app-misc/fujiplay-1.33
deleted file mode 100644
index 257e7dae9e31..000000000000
--- a/app-misc/fujiplay-1.33
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DESCRIPTION=Utility for Fujifilm/Leica digital cameras (via serial port)
-EAPI=0
-HOMEPAGE=http://topo.math.u-psud.fr/~bousch/fujiplay.html
-KEYWORDS=~amd64 x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://topo.math.u-psud.fr/~bousch/fujiplay.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64203875843fd156b2228639ba7d501c
diff --git a/app-misc/fujiplay/Manifest b/app-misc/fujiplay/Manifest
new file mode 100644
index 000000000000..1098bbca8b7b
--- /dev/null
+++ b/app-misc/fujiplay/Manifest
@@ -0,0 +1,4 @@
+AUX fujiplay-1.33-unterminated-strings.patch 3142 BLAKE2B dddbf3b36d07fce5ae216998eb5307b1ac0ac5f251a94308f37b43de8de1180a54c34bd14e07fe79b285982c1d99b76c50ae1b9af7c58174cca2eeb1016332ea SHA512 5e2383ec7f65dce4060b85ad2759f29ad65793b98a77543d098e1ded1895a5996f3d104b27a6f3a0f06dfc6b10d483a3bd9e771207006e73b9995dc3300c5280
+DIST fujiplay.tgz 12588 BLAKE2B 4be2b4d44696f5d43942c19cde308874684c87762b2778026750c4db9ba249c2ec8b7986bca5c526c7199289b3094157c068067db38a015372fd6fbd5a1e285d SHA512 168ce95b6926da2438fb858b2537060877145b28638217214f72833fcc75b76dd7e5bba9ed0ca966cd2f7f1c31ca3302ee4662907bf743c393314d615d795149
+EBUILD fujiplay-1.33.ebuild 1086 BLAKE2B 719c97d033c92c5a9cccd77eefed0b6dd3fda0acc85a9887bd97e54f4fc9702dca037615776e092cd217800f563bff0c04f2a1e74a02d74c5248208d72d8ba66 SHA512 d5a6e81d91ee1b8b3b21ff0f237904d8485c2291fc664cf782ce42fd73979a2f8a8774829a3c30ec9a61d64ad898f4b1c70bdbcb2de875a0f0f88b9b1ca55ed2
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
new file mode 100644
index 000000000000..7f03c696c20e
--- /dev/null
+++ b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
@@ -0,0 +1,75 @@
+--- fujiplay.c 1999-02-23 10:30:31.000000000 +0100
++++ fujiplay.c 2006-08-05 00:50:08.000000000 +0200
+@@ -759,40 +759,38 @@
+ return 1;
+ }
+
+-const char *Usage = "\
+-Usage: fujiplay [OPTIONS] PICTURES... (download)
+- charge NUMBER (recharge the flash)
+- shoot (take picture)
+- preview (preview to standard output)
+- upload FILES...
+- delete FILES...
+- setid STRING (set camera ID)
+- setflash MODE (0=Off, 1=On, 2=Strobe, 3=Auto)
+- setdate gmt|local|YYYYMMDDHHMMSS
+-Options:
+- -B NUMBER Set baudrate (115200, 57600, 38400, 19200, 9600 or 0)
+- -D DEVICE Select another device file (default is /dev/fujifilm)
+- -L List command set
+- -7 DS-7 compatibility mode (experimental)
+- -d Delete pictures after successful download
+- -f Force (overwrite existing files)
+- -p Assume picture numbers instead of frame numbers
+- -h Display this help message
+- -v Version information
+-Pictures:
+- all All pictures
+- last Last picture
+- 4 Only picture 4
+- 2-10 Pictures between 2 and 10
+-Files:
+- DSCxxxxx.JPG Files to delete or to upload into the camera
+-";
+-
+-const char *Copyright = "\
+-Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $
+-Written by Thierry Bousch <bousch@topo.math.u-psud.fr>
+-Public domain. Absolutely no warranty.
+-";
++const char *Usage = "\n" \
++"Usage: fujiplay [OPTIONS] PICTURES... (download) \n" \
++" charge NUMBER (recharge the flash) \n" \
++" shoot (take picture) \n" \
++" preview (preview to standard output) \n" \
++" upload FILES... \n" \
++" delete FILES... \n" \
++" setid STRING (set camera ID) \n" \
++" setflash MODE (0=Off, 1=On, 2=Strobe, 3=Auto) \n" \
++" setdate gmt|local|YYYYMMDDHHMMSS \n" \
++"Options: \n" \
++" -B NUMBER Set baudrate (115200, 57600, 38400, 19200, 9600 or 0) \n" \
++" -D DEVICE Select another device file (default is /dev/fujifilm) \n" \
++" -L List command set \n" \
++" -7 DS-7 compatibility mode (experimental) \n" \
++" -d Delete pictures after successful download \n" \
++" -f Force (overwrite existing files) \n" \
++" -p Assume picture numbers instead of frame numbers \n" \
++" -h Display this help message \n" \
++" -v Version information \n" \
++"Pictures: \n" \
++" all All pictures \n" \
++" last Last picture \n" \
++" 4 Only picture 4 \n" \
++" 2-10 Pictures between 2 and 10 \n" \
++"Files: \n" \
++" DSCxxxxx.JPG Files to delete or to upload into the camera \n";
++
++const char *Copyright = "\n" \
++"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n" \
++"Written by Thierry Bousch <bousch@topo.math.u-psud.fr>\n" \
++"Public domain. Absolutely no warranty.\n";
+
+ static void sigint_handler (int sig)
+ {
diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
new file mode 100644
index 000000000000..17402bcb3856
--- /dev/null
+++ b/app-misc/fujiplay/fujiplay-1.33.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
+HOMEPAGE="http://topo.math.u-psud.fr/~bousch/fujiplay.html"
+SRC_URI="http://topo.math.u-psud.fr/~bousch/${PN}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-unterminated-strings.patch
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ || die "emake failed"
+}
+
+src_install() {
+ dobin fujiplay yycc2ppm || die
+ dodoc README fujiplay.lsm mx700-commands.html
+ emake all clean
+}
+
+pkg_postinst() {
+ ln -s /dev/ttyS0 /dev/fujifilm
+ elog "A symbolic link /dev/ttyS0 -> /dev/fujifilm was created."
+ elog "You may want to create a serial group to allow non-root"
+ elog "members R/W access to the serial device."
+ echo
+}
+
+pkg_postrm() {
+ rm -f /dev/fujifilm
+ echo
+ elog "The symbolic link /dev/fujifilm was removed."
+ echo
+}
diff --git a/app-misc/fujiplay/metadata.xml b/app-misc/fujiplay/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/fujiplay/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/g15composer-3.1 b/app-misc/g15composer-3.1
deleted file mode 100644
index f6f30fa549dc..000000000000
--- a/app-misc/g15composer-3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/g15daemon >=dev-libs/libg15render-1.2[truetype?] truetype? ( media-libs/freetype )
-DESCRIPTION=A library to render text and shapes into a buffer usable by the Logitech G15
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/g15tools/
-IUSE=truetype examples
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/g15tools/g15composer-3.1.tar.bz2
-_md5_=c7800b924f15f46961493eff7dc0bbe9
diff --git a/app-misc/g15composer-3.2 b/app-misc/g15composer-3.2
deleted file mode 100644
index 7b9173a666d9..000000000000
--- a/app-misc/g15composer-3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/g15daemon >=dev-libs/libg15render-1.2[truetype?] truetype? ( media-libs/freetype virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library to render text and shapes into a buffer usable by the Logitech G15
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/g15tools/
-IUSE=truetype examples
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/g15tools/g15composer-3.2.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7c4edc7721ad080dfc78c4b9f9a95b7f
diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
new file mode 100644
index 000000000000..3c6f362f3d8a
--- /dev/null
+++ b/app-misc/g15composer/Manifest
@@ -0,0 +1,10 @@
+AUX g15composer-3.1.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb
+AUX g15composer-3.1.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb
+AUX g15composer-3.2-freetype_pkgconfig.patch 1669 BLAKE2B 75e14fe368c3f1ee5adf357d339fd05773f8dcce279c488a413bc9b69c51abdc02425eeb2fadbb3ba52d2b8baf7d93aac72e981d31c7bf09ba8a6e0206178844 SHA512 6ae9a18927b8fc2066746b8c7532a3e9bb31432ed3ce2af59fbe02a741334b1ae18886e84b10480243f7b4b9001f9931d817efa1c4077d6f775f072c7f2488cc
+AUX g15composer-3.2.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb
+AUX g15composer-3.2.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb
+DIST g15composer-3.1.tar.bz2 104109 BLAKE2B 1880fd469dcbca5031724a23a5abee6d2242738a1674e2635d02aee20fa9859293fa383921f602bf04fb8bdaa294fad9aca099e56bd85b69d41d413f6561a309 SHA512 e4b0ddef2dfbfd3a8a392ebe9e53a59638cbb7aee7a007b8a20be388f074d54a27ed509a5805fadc9ffd708c027ec4c331dfab96905bee1c37690a5585198ad8
+DIST g15composer-3.2.tar.bz2 105805 BLAKE2B 1a843ed50f0374cb23d469be9c083437f13279f5584e3112037635225e5d5df7765452e3e805c4230fd33782c300f5abdb1fc05e394f636d160c8e49baf3dde0 SHA512 95b033e2bb957ef4a2f3d3e2954a11454af7d8576e037f723d2a7d45a7dadde4908540ff0a66b387209e689217ba0e6677dcee1e647b792c402f250371518bc1
+EBUILD g15composer-3.1.ebuild 865 BLAKE2B 32655857abe852de9e6e7c3dda738048fbe9b5cb84740deeebec3b4f6b3eef44f1dbdf651452c2e38af6e1c2bc5b2e3433d365ccbf57e406a6105499188e1464 SHA512 154f43f5e1a276f9a57673349bd1edfda7c6427a3ff57cc039d05bd62d887ca60e7eefb71c0aed54fad757778e381c26459474ffc757972052e9a6b1a301434a
+EBUILD g15composer-3.2.ebuild 1079 BLAKE2B 3a8a796a9cb74b3420c887e7c34e19ed7ae2bba36493b1db126fc2263e8df0c818468cd85f5fe462ced8308659d25514e0767af445b18c485da38d9a4df81c7a SHA512 6edd1c493c8e5acaaa8fca45748e23eca4862d7b0d207bf6f12801448b0b723177e4be283b81560588dfa48271c934e86d65905d54c6754c277642f8c5511b77
+MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/app-misc/g15composer/files/g15composer-3.1.confd b/app-misc/g15composer/files/g15composer-3.1.confd
new file mode 100644
index 000000000000..f42ab956e242
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.1.confd
@@ -0,0 +1,17 @@
+# /etc/conf.d/g15composer: Configuration for the g15composer
+
+# The CONTROL_FIFO is the name of the FIFO that g15composer listens to.
+# It does not create a screen on the display, but allows programs to
+# create their own non-virtual screens.
+# Please make sure the file specified does not exist.
+CONTROL_FIFO="/var/run/g15composer"
+
+# Set the user who owns the CONTROL_FIFO.
+# As this is also the user as whom g15composer is run,
+# it has to be someone who can create further message channels
+# This should be the user who runs the LCD clients
+FIFO_USER=
+
+# Set the grop which owns the CONTROL_FIFO.
+# The users who want to display screens on the LCD need to be in this group.
+FIFO_GROUP=users
diff --git a/app-misc/g15composer/files/g15composer-3.1.initd b/app-misc/g15composer/files/g15composer-3.1.initd
new file mode 100644
index 000000000000..0d7c24f85609
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.1.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+ need g15daemon
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+
+ if [ -z "${FIFO_USER}" -o -z "${FIFO_GROUP}" ] ; then
+ eerror "Please set the FIFO_USER and FIFO_GROUP variables in /etc/conf.d/${SVCNAME}"
+ eend 1
+ return 1
+ fi
+ if [ -e "${CONTROL_FIFO}" -a ! -p "${CONTROL_FIFO}" ] ; then
+ eerror "${CONTROL_FIFO} exists and is not a FIFO. Please remove."
+ eend 1
+ return 1
+ fi
+ if [ ! -p "${CONTROL_FIFO}" ] ; then
+ einfo "Creating FIFO at ${CONTROL_FIFO}"
+ mkfifo -m660 "${CONTROL_FIFO}"
+ else
+ einfo "Reusing FIFO at ${CONTROL_FIFO}"
+ fi
+
+ chown ${FIFO_USER} "${CONTROL_FIFO}"
+ chgrp ${FIFO_GROUP} "${CONTROL_FIFO}"
+ start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \
+ /usr/bin/g15composer -- -b -u "${FIFO_USER}" -g "${FIFO_GROUP}" "${CONTROL_FIFO}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stoping ${SVCNAME}"
+ start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
+ if [ -p "${CONTROL_FIFO}" ] ; then
+ einfo "Removing FIFO at ${CONTROL_FIFO}"
+ rm -f "${CONTROL_FIFO}"
+ else
+ ewarn "FIFO at ${CONTROL_FIFO} was lost"
+ fi
+ eend $?
+}
diff --git a/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..9251e139322d
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch
@@ -0,0 +1,44 @@
+--- g15composer-3.2/configure.in
++++ g15composer-3.2/configure.in
+@@ -14,24 +14,24 @@
+ AC_PROG_YACC
+
+ # Checks for --enable args
+-AC_MSG_CHECKING(whether to enable FreeType2 support)
+-AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],
+- if [[[ "$enableval" = "yes" ]]]; then
+- AC_CHECK_LIB([g15render], [g15r_ttfLoad],
+- AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
+- CFLAGS="$CFLAGS `freetype-config --cflags`"
+- CXXFLAGS="$CXXFLAGS `freetype-config --cflags`"
+- FTLIB="-lfreetype"
+- ttf_support="yes",
+- AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"])
+- ttf_support="no"
+- )
+- else
+- ttf_support="no"
+- fi,
+- ttf_support="no"
++AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],,enable_ttf="no")
++AS_IF([test "x$enable_ttf" = "xyes"], [
++ PKG_PROG_PKG_CONFIG
++ PKG_CHECK_MODULES(FREETYPE, freetype2,
++ [
++ CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
++ CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
++ FTLIB="$FREETYPE_LIBS"
++ ],
++ AC_MSG_ERROR([Cannot find freetype2])
++ )
++ AC_CHECK_LIB([g15render], [g15r_ttfLoad],
++ AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]),
++ AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"])
++ )
++],
++ AC_MSG_RESULT(No Freetype is being used)
+ )
+-AC_MSG_RESULT($ttf_support)
+
+ # Checks for libraries.
+ AC_CHECK_LIB([g15daemon_client], [g15_send], ,AC_MSG_ERROR(["libg15daemon_client not found. please install it"]))
diff --git a/app-misc/g15composer/files/g15composer-3.2.confd b/app-misc/g15composer/files/g15composer-3.2.confd
new file mode 100644
index 000000000000..f42ab956e242
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2.confd
@@ -0,0 +1,17 @@
+# /etc/conf.d/g15composer: Configuration for the g15composer
+
+# The CONTROL_FIFO is the name of the FIFO that g15composer listens to.
+# It does not create a screen on the display, but allows programs to
+# create their own non-virtual screens.
+# Please make sure the file specified does not exist.
+CONTROL_FIFO="/var/run/g15composer"
+
+# Set the user who owns the CONTROL_FIFO.
+# As this is also the user as whom g15composer is run,
+# it has to be someone who can create further message channels
+# This should be the user who runs the LCD clients
+FIFO_USER=
+
+# Set the grop which owns the CONTROL_FIFO.
+# The users who want to display screens on the LCD need to be in this group.
+FIFO_GROUP=users
diff --git a/app-misc/g15composer/files/g15composer-3.2.initd b/app-misc/g15composer/files/g15composer-3.2.initd
new file mode 100644
index 000000000000..0d7c24f85609
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+ need g15daemon
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+
+ if [ -z "${FIFO_USER}" -o -z "${FIFO_GROUP}" ] ; then
+ eerror "Please set the FIFO_USER and FIFO_GROUP variables in /etc/conf.d/${SVCNAME}"
+ eend 1
+ return 1
+ fi
+ if [ -e "${CONTROL_FIFO}" -a ! -p "${CONTROL_FIFO}" ] ; then
+ eerror "${CONTROL_FIFO} exists and is not a FIFO. Please remove."
+ eend 1
+ return 1
+ fi
+ if [ ! -p "${CONTROL_FIFO}" ] ; then
+ einfo "Creating FIFO at ${CONTROL_FIFO}"
+ mkfifo -m660 "${CONTROL_FIFO}"
+ else
+ einfo "Reusing FIFO at ${CONTROL_FIFO}"
+ fi
+
+ chown ${FIFO_USER} "${CONTROL_FIFO}"
+ chgrp ${FIFO_GROUP} "${CONTROL_FIFO}"
+ start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \
+ /usr/bin/g15composer -- -b -u "${FIFO_USER}" -g "${FIFO_GROUP}" "${CONTROL_FIFO}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stoping ${SVCNAME}"
+ start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
+ if [ -p "${CONTROL_FIFO}" ] ; then
+ einfo "Removing FIFO at ${CONTROL_FIFO}"
+ rm -f "${CONTROL_FIFO}"
+ else
+ ewarn "FIFO at ${CONTROL_FIFO} was lost"
+ fi
+ eend $?
+}
diff --git a/app-misc/g15composer/g15composer-3.1.ebuild b/app-misc/g15composer/g15composer-3.1.ebuild
new file mode 100644
index 000000000000..28ae4aaf5304
--- /dev/null
+++ b/app-misc/g15composer/g15composer-3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
+SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="truetype examples"
+
+DEPEND="app-misc/g15daemon
+ >=dev-libs/libg15render-1.2[truetype?]
+ truetype? ( media-libs/freetype )"
+
+src_configure() {
+ econf \
+ $(use_enable truetype ttf)
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}/${P}.initd" ${PN}
+ newconfd "${FILESDIR}/${P}.confd" ${PN}
+
+ if use examples ; then
+ exeinto "/usr/share/${PN}"
+ doexe examples/*
+ fi
+}
+
+pkg_postinst() {
+ elog "Set the user to run g15composer in /etc/conf.d/g15composer before starting the service."
+}
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild
new file mode 100644
index 000000000000..03f3cb42bbfd
--- /dev/null
+++ b/app-misc/g15composer/g15composer-3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
+SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="truetype examples"
+
+DEPEND="app-misc/g15daemon
+ >=dev-libs/libg15render-1.2[truetype?]
+ truetype? (
+ media-libs/freetype
+ virtual/pkgconfig
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch
+)
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable truetype ttf)
+}
+
+src_install() {
+ local DOCS=( AUTHORS README ChangeLog )
+ default
+
+ newinitd "${FILESDIR}/${P}.initd" ${PN}
+ newconfd "${FILESDIR}/${P}.confd" ${PN}
+
+ if use examples ; then
+ exeinto "/usr/share/${PN}"
+ doexe examples/*
+ fi
+}
+
+pkg_postinst() {
+ elog "Set the user to run g15composer in /etc/conf.d/g15composer before starting the service."
+}
diff --git a/app-misc/g15composer/metadata.xml b/app-misc/g15composer/metadata.xml
new file mode 100644
index 000000000000..da7ba4ad6e9d
--- /dev/null
+++ b/app-misc/g15composer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">g15tools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/g15daemon-1.9.5.3-r13 b/app-misc/g15daemon-1.9.5.3-r13
deleted file mode 100644
index 024224e7d0cf..000000000000
--- a/app-misc/g15daemon-1.9.5.3-r13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Takes control of the G15 keyboard, through the linux kernel uinput device driver
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-IUSE=perl python static-libs kernel_linux python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d525e5f7e352abed194a778c8749e38
diff --git a/app-misc/g15daemon-1.9.5.3-r21 b/app-misc/g15daemon-1.9.5.3-r21
deleted file mode 100644
index 9ef791b7519a..000000000000
--- a/app-misc/g15daemon-1.9.5.3-r21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Takes control of the G15 keyboard, through the linux kernel uinput device driver
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-IUSE=perl python static-libs kernel_linux python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c704f6638b909432d5f6e7e39b369675
diff --git a/app-misc/g15daemon-9999 b/app-misc/g15daemon-9999
deleted file mode 100644
index 3f2669f72856..000000000000
--- a/app-misc/g15daemon-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Takes control of the G15 keyboard, through the linux kernel uinput device driver
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-IUSE=perl python static-libs kernel_linux python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 subversion a5d5826a85609611f098c0553eb24cc1 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f86fcc3e254caa6926c0ed7729ed022c
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
new file mode 100644
index 000000000000..ac06d8919aa6
--- /dev/null
+++ b/app-misc/g15daemon/Manifest
@@ -0,0 +1,14 @@
+AUX 20g15daemon 173 BLAKE2B 70c9a7e6769d98f2f8195a8d8e120fc514e956125c5d887412a165c2c038006060169f8fddc31a0334c543dde083136682cdec34b27418fd99cb4776a0cdac2c SHA512 daee2c432860dd3147209724417cbf04ec1ed0c8e882900900722420cbe67d88f32efc81422e04221e54796b66d69e050135b72a96baf40137da58023202d3ca
+AUX 99-g15daemon.rules 90 BLAKE2B ffcee5b3039d9aa1d63ff6d58fb29d84a2c9988dc4815407ec8c529e874d3af1d8f05f0623588a3264e3ece6cf23168b4c6a102316c249ae26b68f4311dd2359 SHA512 f3ff958bb4e0344b600328fcab86674ce14d852287ec2e083751d0eb855a0591aa17fdae767de4517bcd8a1fa542ab9b559ee79fe284207d2872b8901f2c77f7
+AUX g15daemon-1.2.7.confd 329 BLAKE2B 1c28f1ee1c6400cc1067df7bfddf66a138abcaf0168b548511c390233392eb722d3c5c5c9d03d6106eecdec5c37fd4588d80713bb0793879cfe6701c89368cfb SHA512 ea94ab43c78566c570a510cccb6860ade6c26a281956b6e37ea746eb06608a5a00ed55773752c7aad44bf86cdfec5788e9f1137667fd5030d54b20b97811b43a
+AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 BLAKE2B dcd28ba55f823c26cf38d273a5bd9893715de3e361cdca73cb9e0baf015da04a23f239bcc9471b8d52a623e82c5b2bb6e39bb5cb28dc7d92b4b5397544ccdb71 SHA512 dc603a576eaf6bd8512827de712c3ba6a116905d5f6c692dccda1b499a3bab8480a785155d3b0189b41e2dff099fc5896cb958bcc83357ff54333a82f4b6ca93
+AUX g15daemon-1.9.5.3-g510-keys.patch 14095 BLAKE2B 51e0fc084298923a44fc7453cb7d91dd39f54685c67a09eaf90628e1f0005569f9cb702f66425bb5ca243d97b70c74b68e512bf89a6f509a6f8240b08004ba5a SHA512 ac43f573175a8842ac571fe4d30fe2b2bb901d46da75fb9a7fe591b6a144df6308c5aecb65319667e01a316414cbccf44dbb492412e0d28bd9fb1cd09ce9bb75
+AUX g15daemon-1.9.5.3-overflow-fix.patch 619 BLAKE2B 8d7f71d946315b1844c25ad3687fcceb0e7c1e87ad818b6b70b4accda951d10a271214945f4b03360e4b999a3229405b7728b3154cfa74a65c0f1d47ca223616 SHA512 e5f4494c0890ce985391d5a07d809e7168f765549c17b55457d93436ce816074aa97f991b894067badacf5e0bcc7f482d6b7e1623b0157a04d728f2ca4b1bf27
+AUX g15daemon-1.9.5.3.initd 955 BLAKE2B fe4c71358d206768dde9d0361ab926f8e36d2fce1d46a15992ec4880c0df37ec2ae26808902d7593c5c1783f679c1c12d163d8a6f409f2d6931f432b08f8a7c4 SHA512 a2e21fe65f730e0a3f0062da07a9896884329e3d3b2cb89ce41b96f33851868c0c27281fc87a13eb7bb7ba934175df19dddfd78b695339b4a89512c42951fd1a
+AUX g15daemon-hotplug 224 BLAKE2B 6348dfec6c942d28c2db287b82765f194ffd7d1e9c58faaf03670ff6222f0a32fb70428873452d8229a967849f49b3042ef20352d677b0e5d4dc05b7f769caee SHA512 6384aa8267a665b0b26f45f7339856647374ad5b1860f299b2e19afb0209b8637919f00b3638affbe4fb86adaf115eb93e814b70c17d52f1c878d840e1e464e8
+AUX g15daemon.conf 516 BLAKE2B 9a003040306ddfeccccb5b12730c6c1c478ab39cf44abbacfaed37b7154f2485cbc0979f900523457e14a5ca14041b41bf2da0c3b4d7519f2e798b0cb291f4c4 SHA512 e575fd8a91c87f226481ae406a1b66de6d8eb66f061b0ce7f2b89ce63f7bda88470eac50adcc9de97ef866970ee835af8a1bb0402a2e4b4d214251d0b8ebe25c
+DIST g15daemon-1.9.5.3.tar.gz 414603 BLAKE2B 4f683bab47f6cbde3a028b306c1999ea4fcb84c0c05160a17374be93f953d21588f332e8fbf040c607545c31ee09e30b56b1068db95a801472c9d72ee9fe8e43 SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a
+EBUILD g15daemon-1.9.5.3-r13.ebuild 3844 BLAKE2B c729568b5b17b7f0e1fab0baa447c08754522cc64d6ae4ea44069af01c77b8df1c5b3aa2766c5595403bbe0825ef107513dbb7a3e3ad2cb93afc4eb2b9b21f76 SHA512 f04650f6cedf3924460827ac4ddfa43e6ec65dd810e11cf6d345f3dd7c81b1069cc5812ba25d52d979ba0b54d69b435c2cb0fd1f82301ca69db6b4a5ad69c54e
+EBUILD g15daemon-1.9.5.3-r21.ebuild 3861 BLAKE2B 07d5c7ba8973c98b821023110f4e9fbcf4992a35ed0cbeef3d404e867782faaa51cace995db969d74da64f5b81cfedef04ee4825fdfa0198f00bd5f07ea5475d SHA512 0756e936b6938f1c9ae69201005a8b1602d03bd5e09ea042925d043f112a576133c62d5b6f6f32e5beb749faf04f366c9832c2f774b0084d6fd35cafe38518ca
+EBUILD g15daemon-9999.ebuild 4201 BLAKE2B d93f82ca46892521cd0e609ba1cf5f23ca1de0fcd563a1aaf94248b87f535cf53aeebca5a98c20768571bd8abaa0a481124fc1b0e34c2036e0e94f0de39c5c2a SHA512 053af76acaf9c8dc01aa8194ccc262a84bcf938ffc6cbcd32dd1bcc93f03548c5032729ea0aabd2521ea2d73d32fcc65c53be17412058ff97604f920ba1d9d33
+MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15daemon/files/20g15daemon b/app-misc/g15daemon/files/20g15daemon
new file mode 100644
index 000000000000..ee1422537f25
--- /dev/null
+++ b/app-misc/g15daemon/files/20g15daemon
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. "${PM_FUNCTIONS}"
+
+case "$1" in
+ hibernate|suspend)
+ /etc/init.d/g15daemon stop
+ ;;
+ thaw|resume)
+ /etc/init.d/g15daemon start
+ ;;
+ *)
+ exit $NA
+ ;;
+esac
diff --git a/app-misc/g15daemon/files/99-g15daemon.rules b/app-misc/g15daemon/files/99-g15daemon.rules
new file mode 100644
index 000000000000..d491d683684f
--- /dev/null
+++ b/app-misc/g15daemon/files/99-g15daemon.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{product}=="G15 Gaming Keyboard", RUN+="/usr/bin/g15daemon-hotplug"
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
new file mode 100644
index 000000000000..08ea97f49763
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
@@ -0,0 +1,9 @@
+# /etc/conf.d/g15daemon: Configuration for the g15daemon
+
+# Key to switch the client-screens. Default is the MR key,
+# Set to "yes" to use L1 key instead (black round key below the LCD, above the multimedia keys).
+CLIENT_SWITCH_L1="no"
+
+# Set to "yes" to switch off the lcd backlight when stopping g15daemon.
+BACKLIGHT_OFF="no"
+
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
new file mode 100644
index 000000000000..b475f1d58d69
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
@@ -0,0 +1,11 @@
+--- ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2008-01-26 06:02:07.000000000 +0100
++++ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2009-02-01 17:00:55.203009264 +0100
+@@ -356,7 +356,7 @@
+ config_items_t * item=NULL;
+ char line[1024];
+
+- config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC);
++ config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC,0664);
+ if(config_fd){
+ snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n");
+ write(config_fd,line,strlen(line));
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
new file mode 100644
index 000000000000..e00836766795
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
@@ -0,0 +1,340 @@
+From https://sourceforge.net/tracker/?func=detail&aid=3152167&group_id=167869&atid=844658
+
+diff -aNru trunk/g15daemon-wip/plugins/g15_plugin_uinput.c mod/g15daemon-wip/plugins/g15_plugin_uinput.c
+--- trunk/g15daemon-wip/plugins/g15_plugin_uinput.c 2011-06-26 06:50:50.000000000 +0000
++++ mod/g15daemon-wip/plugins/g15_plugin_uinput.c 2011-06-26 06:51:42.000000000 +0000
+@@ -164,146 +164,195 @@
+
+ static void g15_process_keys(g15daemon_t *masterlist, unsigned int currentkeys, unsigned int lastkeys)
+ {
+- /* 'G' keys */
+- if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
+- keydown(GKEY_OFFSET);
+- else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
+- keyup(GKEY_OFFSET);
+-
+- if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
+- keydown(GKEY_OFFSET+1);
+- else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
+- keyup(GKEY_OFFSET+1);
+-
+- if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
+- keydown(GKEY_OFFSET+2);
+- else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
+- keyup(GKEY_OFFSET+2);
+-
+- if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
+- keydown(GKEY_OFFSET+3);
+- else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
+- keyup(GKEY_OFFSET+3);
+-
+- if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
+- keydown(GKEY_OFFSET+4);
+- else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
+- keyup(GKEY_OFFSET+4);
+-
+- if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
+- keydown(GKEY_OFFSET+5);
+- else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
+- keyup(GKEY_OFFSET+5);
+-
+- if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
+- keydown(GKEY_OFFSET+6);
+- else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
+- keyup(GKEY_OFFSET+6);
+-
+- if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
+- keydown(GKEY_OFFSET+7);
+- else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
+- keyup(GKEY_OFFSET+7);
+-
+- if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
+- keydown(GKEY_OFFSET+8);
+- else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
+- keyup(GKEY_OFFSET+8);
+-
+- if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
+- keydown(GKEY_OFFSET+9);
+- else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
+- keyup(GKEY_OFFSET+9);
+-
+- if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
+- keydown(GKEY_OFFSET+10);
+- else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
+- keyup(GKEY_OFFSET+10);
+-
+- if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
+- keydown(GKEY_OFFSET+11);
+- else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
+- keyup(GKEY_OFFSET+11);
+-
+- if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
+- keydown(GKEY_OFFSET+12);
+- else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
+- keyup(GKEY_OFFSET+12);
+-
+- if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
+- keydown(GKEY_OFFSET+13);
+- else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
+- keyup(GKEY_OFFSET+13);
+-
+- if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
+- keydown(GKEY_OFFSET+14);
+- else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
+- keyup(GKEY_OFFSET+14);
+-
+- if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
+- keydown(GKEY_OFFSET+15);
+- else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
+- keyup(GKEY_OFFSET+15);
+-
+- if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
+- keydown(GKEY_OFFSET+16);
+- else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
+- keyup(GKEY_OFFSET+16);
+-
+- if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
+- keydown(GKEY_OFFSET+17);
+- else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
+- keyup(GKEY_OFFSET+17);
+-
+- /* 'M' keys */
+-
+- if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
+- keydown(MKEY_OFFSET);
+- else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
+- keyup(MKEY_OFFSET);
+-
+- if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
+- keydown(MKEY_OFFSET+1);
+- else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
+- keyup(MKEY_OFFSET+1);
+-
+- if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
+- keydown(MKEY_OFFSET+2);
+- else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
+- keyup(MKEY_OFFSET+2);
+-
+- if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
+- keydown(MKEY_OFFSET+3);
+- else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
+- keyup(MKEY_OFFSET+3);
+-
+- if(map_Lkeys){
+- /* 'L' keys... */
+- if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
+- keydown(LKEY_OFFSET);
+- else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
+- keyup(LKEY_OFFSET);
+-
+- if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
+- keydown(LKEY_OFFSET+1);
+- else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
+- keyup(LKEY_OFFSET+1);
+-
+- if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
+- keydown(LKEY_OFFSET+2);
+- else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
+- keyup(LKEY_OFFSET+2);
+-
+- if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
+- keydown(LKEY_OFFSET+3);
+- else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
+- keyup(LKEY_OFFSET+3);
+-
+- if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
+- keydown(LKEY_OFFSET+4);
+- else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
+- keyup(LKEY_OFFSET+4);
++ if(!(currentkeys & G15_KEY_LIGHT))
++ {
++ /* 'G' keys */
++ if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
++ keydown(GKEY_OFFSET);
++ else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
++ keyup(GKEY_OFFSET);
++
++ if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
++ keydown(GKEY_OFFSET+1);
++ else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
++ keyup(GKEY_OFFSET+1);
++
++ if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
++ keydown(GKEY_OFFSET+2);
++ else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
++ keyup(GKEY_OFFSET+2);
++
++ if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
++ keydown(GKEY_OFFSET+3);
++ else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
++ keyup(GKEY_OFFSET+3);
++
++ if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
++ keydown(GKEY_OFFSET+4);
++ else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
++ keyup(GKEY_OFFSET+4);
++
++ if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
++ keydown(GKEY_OFFSET+5);
++ else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
++ keyup(GKEY_OFFSET+5);
++
++ if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
++ keydown(GKEY_OFFSET+6);
++ else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
++ keyup(GKEY_OFFSET+6);
++
++ if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
++ keydown(GKEY_OFFSET+7);
++ else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
++ keyup(GKEY_OFFSET+7);
++
++ if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
++ keydown(GKEY_OFFSET+8);
++ else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
++ keyup(GKEY_OFFSET+8);
++
++ if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
++ keydown(GKEY_OFFSET+9);
++ else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
++ keyup(GKEY_OFFSET+9);
++
++ if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
++ keydown(GKEY_OFFSET+10);
++ else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
++ keyup(GKEY_OFFSET+10);
++
++ if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
++ keydown(GKEY_OFFSET+11);
++ else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
++ keyup(GKEY_OFFSET+11);
++
++ if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
++ keydown(GKEY_OFFSET+12);
++ else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
++ keyup(GKEY_OFFSET+12);
++
++ if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
++ keydown(GKEY_OFFSET+13);
++ else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
++ keyup(GKEY_OFFSET+13);
++
++ if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
++ keydown(GKEY_OFFSET+14);
++ else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
++ keyup(GKEY_OFFSET+14);
++
++ if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
++ keydown(GKEY_OFFSET+15);
++ else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
++ keyup(GKEY_OFFSET+15);
++
++ if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
++ keydown(GKEY_OFFSET+16);
++ else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
++ keyup(GKEY_OFFSET+16);
++
++ if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
++ keydown(GKEY_OFFSET+17);
++ else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
++ keyup(GKEY_OFFSET+17);
++
++ /* 'M' keys */
++
++ if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
++ keydown(MKEY_OFFSET);
++ else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
++ keyup(MKEY_OFFSET);
++
++ if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
++ keydown(MKEY_OFFSET+1);
++ else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
++ keyup(MKEY_OFFSET+1);
++
++ if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
++ keydown(MKEY_OFFSET+2);
++ else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
++ keyup(MKEY_OFFSET+2);
++
++ if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
++ keydown(MKEY_OFFSET+3);
++ else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
++ keyup(MKEY_OFFSET+3);
++
++ if(map_Lkeys){
++ /* 'L' keys... */
++ if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
++ keydown(LKEY_OFFSET);
++ else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
++ keyup(LKEY_OFFSET);
++
++ if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
++ keydown(LKEY_OFFSET+1);
++ else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
++ keyup(LKEY_OFFSET+1);
++
++ if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
++ keydown(LKEY_OFFSET+2);
++ else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
++ keyup(LKEY_OFFSET+2);
++
++ if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
++ keydown(LKEY_OFFSET+3);
++ else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
++ keyup(LKEY_OFFSET+3);
++
++ if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
++ keydown(LKEY_OFFSET+4);
++ else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
++ keyup(LKEY_OFFSET+4);
++ }
+ }
++ else
++ {
++ // G15_KEY_LIGHT - Key modifier for Logitech G510 Media Keys implementation
++
++ // XF86AudioPlay
++ if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
++ keydown(KEY_PLAYPAUSE);
++ else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
++ keyup(KEY_PLAYPAUSE);
++
++ // XF86AudioStop
++ if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
++ keydown(KEY_STOPCD);
++ else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
++ keyup(KEY_STOPCD);
++
++ // XF86AudioPrev
++ if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
++ keydown(KEY_PREVIOUSSONG);
++ else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
++ keyup(KEY_PREVIOUSSONG);
++
++ // XF86AudioNext
++ if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
++ keydown(KEY_NEXTSONG);
++ else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
++ keyup(KEY_NEXTSONG);
++
++ // XF86AudioMute
++ if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
++ keydown(KEY_MUTE);
++ else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
++ keyup(KEY_MUTE);
++
++ // XF86AudioRaiseVolume
++ if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
++ keydown(KEY_VOLUMEUP);
++ else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
++ keyup(KEY_VOLUMEUP);
++
++ // XF86AudioLowerVolume
++ if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
++ keydown(KEY_VOLUMEDOWN);
++ else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
++ keyup(KEY_VOLUMEDOWN);
++ }
+ }
+
+
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
new file mode 100644
index 000000000000..71cbf914d839
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
@@ -0,0 +1,11 @@
+--- ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2008-01-25 05:45:05.000000000 +0100
++++ ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2011-02-14 22:51:55.203009264 +0100
+@@ -217,7 +217,7 @@
+ if(poll(pfd,1,100)>0){
+ if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) {
+ memset(packet,0,sizeof(packet));
+- msgret = recv(sock, packet, 10 , MSG_OOB);
++ msgret = recv(sock, packet, sizeof(packet), MSG_OOB);
+ if (msgret < 1) {
+ return -1;
+ }
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd b/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
new file mode 100644
index 000000000000..aa4d82c9d6b6
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Init script for g15daemon
+
+pidfile="/var/run/g15daemon.pid"
+command="/usr/sbin/g15daemon"
+start_stop_daemon_args="--wait 30"
+command_args=""
+
+depend() {
+ after hotplug
+ after usb
+ after modules
+}
+
+start_pre() {
+ # Does the input device already exist?
+ if [ -e "/proc/modules" ] ; then
+ if [ ! -e "/dev/input/uinput" ] && [ ! -e "/dev/uinput" ] ; then
+ # We can load modules, but uinput device does not exist
+ einfo "Loading uinput module"
+ /sbin/modprobe uinput > /dev/null 2> /dev/null \
+ || return 1
+ fi
+ fi
+
+ if [ "${CLIENT_SWITCH_L1}" = "yes" ] ; then
+ command_args="--switch"
+ fi
+}
+
+stop() {
+ ebegin "Stopping g15daemon"
+ local KILLOPT="-k"
+ if [ $BACKLIGHT_OFF = "yes" ]; then
+ KILLOPT="-K"
+ fi
+ while [ -f "${pidfile}" ] && kill -0 $(cat ${pidfile}) ; do
+ ${command} ${KILLOPT}
+ sleep 1
+ done
+ eend $?
+}
diff --git a/app-misc/g15daemon/files/g15daemon-hotplug b/app-misc/g15daemon/files/g15daemon-hotplug
new file mode 100644
index 000000000000..2ae8be0bde01
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-hotplug
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+export IN_HOTPLUG=1
+
+case "$ACTION" in
+ "add")
+ /etc/init.d/g15daemon --quiet restart
+ ;;
+ "remove")
+ /etc/init.d/g15daemon --quiet stop
+ ;;
+ *)
+ exit 0
+ ;;
+esac
diff --git a/app-misc/g15daemon/files/g15daemon.conf b/app-misc/g15daemon/files/g15daemon.conf
new file mode 100644
index 000000000000..2d2bfc3cabde
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon.conf
@@ -0,0 +1,27 @@
+# G15Daemon Configuration File
+# any items entered before a [section] header
+# will be in the Global config space
+# comments you wish to keep should start with a semicolon';'
+
+[Global]
+Use MR as Cycle Key: Off
+
+[PLUGIN_LOAD_ORDER]
+0: g15plugin_uinput.so
+1: g15plugin_clock.so
+2: g15plugin_tcpserver.so
+TotalPlugins: 3
+
+[PLUGINS]
+Linux UINPUT Keyboard Output: Load
+Clock: Load
+LCDServer: Load
+
+[Keyboard OS Mapping (uinput)]
+device: /dev/input/uinput
+Lkeys.mapped: 0
+
+[Clock]
+24hrFormat: On
+ShowDate: Off
+Digital: On
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
new file mode 100644
index 000000000000..9dd8a9dafdb0
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit eutils linux-info perl-module python-r1 base
+
+DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+ >=dev-libs/libg15-1.2.4
+ >=dev-libs/libg15render-1.2
+ perl? (
+ dev-lang/perl
+ dev-perl/GDGraph
+ >=dev-perl/Inline-0.4
+ )
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-forgotten-open-mode.patch"
+ "${FILESDIR}/${P}-overflow-fix.patch"
+)
+uinput_check() {
+ ebegin "Checking for uinput support"
+ local rc=1
+ linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+ rc=$?
+
+ if [[ $rc -ne 0 ]] ; then
+ eerror "To use g15daemon, you need to compile your kernel with uinput support."
+ eerror "Please enable uinput support in your kernel config, found at:"
+ eerror
+ eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+ eerror
+ eerror "Once enabled, you should have the /dev/input/uinput device."
+ eerror "g15daemon will not work without the uinput device."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ uinput_check
+}
+
+src_unpack() {
+ unpack ${A}
+ if use perl; then
+ unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+ fi
+ if use python; then
+ unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+ fi
+}
+
+src_prepare() {
+ if use perl; then
+ perl-module_src_prepare
+ sed -i \
+ -e '1i#!/usr/bin/perl' \
+ "${S}"/contrib/testbindings.pl
+ else
+ # perl-module_src_prepare always calls base_src_prepare
+ base_src_prepare
+ fi
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_compile
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ # remove odd docs installed my make
+ rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+ insinto /usr/share/${PN}/contrib
+ doins contrib/xmodmaprc
+ doins contrib/xmodmap.sh
+ if use perl; then
+ doins contrib/testbindings.pl
+ fi
+
+ newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
+ dobin "${FILESDIR}/g15daemon-hotplug"
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}/99-g15daemon.rules"
+
+ insinto /etc
+ doins "${FILESDIR}"/g15daemon.conf
+
+ # Gentoo bug #301340, debian bug #611649
+ exeinto /usr/lib/pm-utils/sleep.d
+ doexe "${FILESDIR}"/20g15daemon
+
+ if use perl; then
+ ebegin "Installing Perl Bindings (G15Daemon.pm)"
+ cd "${WORKDIR}/G15Daemon-0.2"
+ docinto perl
+ perl-module_src_install
+ fi
+
+ if use python; then
+ ebegin "Installing Python Bindings (g15daemon.py)"
+ cd "${WORKDIR}/pyg15daemon"
+
+ python_foreach_impl python_domodule g15daemon.py
+
+ docinto python
+ dodoc AUTHORS
+ fi
+}
+
+pkg_postinst() {
+ elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+ elog "This can be done with:"
+ elog "# /sbin/rc-update add g15daemon default"
+ elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+ elog ""
+ elog "To have all new keys working in X11, you'll need create a "
+ elog "specific xmodmap in your home directory or edit the existent one."
+ elog ""
+ elog "Create the xmodmap:"
+ elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+ elog ""
+ elog "Adding keycodes to an existing xmodmap:"
+ elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
new file mode 100644
index 000000000000..0d6bc4d90920
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit eutils linux-info perl-module python-r1 base
+
+DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+ >=dev-libs/libg15-9999
+ >=dev-libs/libg15render-1.2
+ perl? (
+ dev-lang/perl
+ dev-perl/GDGraph
+ >=dev-perl/Inline-0.4
+ )
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-forgotten-open-mode.patch"
+ "${FILESDIR}/${P}-overflow-fix.patch"
+ "${FILESDIR}/${P}-g510-keys.patch"
+)
+
+uinput_check() {
+ ebegin "Checking for uinput support"
+ local rc=1
+ linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+ rc=$?
+
+ if [[ $rc -ne 0 ]] ; then
+ eerror "To use g15daemon, you need to compile your kernel with uinput support."
+ eerror "Please enable uinput support in your kernel config, found at:"
+ eerror
+ eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+ eerror
+ eerror "Once enabled, you should have the /dev/input/uinput device."
+ eerror "g15daemon will not work without the uinput device."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ uinput_check
+}
+
+src_unpack() {
+ unpack ${A}
+ if use perl; then
+ unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+ fi
+ if use python; then
+ unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+ fi
+}
+
+src_prepare() {
+ if use perl; then
+ perl-module_src_prepare
+ sed -i \
+ -e '1i#!/usr/bin/perl' \
+ "${S}"/contrib/testbindings.pl
+ else
+ # perl-module_src_prepare always calls base_src_prepare
+ base_src_prepare
+ fi
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_compile
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ # remove odd docs installed my make
+ rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+ insinto /usr/share/${PN}/contrib
+ doins contrib/xmodmaprc
+ doins contrib/xmodmap.sh
+ if use perl; then
+ doins contrib/testbindings.pl
+ fi
+
+ newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
+ dobin "${FILESDIR}/g15daemon-hotplug"
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}/99-g15daemon.rules"
+
+ insinto /etc
+ doins "${FILESDIR}"/g15daemon.conf
+
+ # Gentoo bug #301340, debian bug #611649
+ exeinto /usr/lib/pm-utils/sleep.d
+ doexe "${FILESDIR}"/20g15daemon
+
+ if use perl; then
+ ebegin "Installing Perl Bindings (G15Daemon.pm)"
+ cd "${WORKDIR}/G15Daemon-0.2"
+ docinto perl
+ perl-module_src_install
+ fi
+
+ if use python; then
+ ebegin "Installing Python Bindings (g15daemon.py)"
+ cd "${WORKDIR}/pyg15daemon"
+
+ python_foreach_impl python_domodule g15daemon.py
+
+ docinto python
+ dodoc AUTHORS
+ fi
+}
+
+pkg_postinst() {
+ elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+ elog "This can be done with:"
+ elog "# /sbin/rc-update add g15daemon default"
+ elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+ elog ""
+ elog "To have all new keys working in X11, you'll need create a "
+ elog "specific xmodmap in your home directory or edit the existent one."
+ elog ""
+ elog "Create the xmodmap:"
+ elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+ elog ""
+ elog "Adding keycodes to an existing xmodmap:"
+ elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
new file mode 100644
index 000000000000..5e6baded32a9
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+GENTOO_DEPEND_ON_PERL="no"
+ESVN_PROJECT=${PN}/trunk
+ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip"
+
+inherit eutils linux-info perl-module python-r1 base subversion autotools
+
+DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+ >=dev-libs/libg15-9999
+ >=dev-libs/libg15render-9999
+ perl? (
+ dev-lang/perl
+ dev-perl/GDGraph
+ >=dev-perl/Inline-0.4
+ )
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
+)
+# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
+# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
+
+uinput_check() {
+ ebegin "Checking for uinput support"
+ local rc=1
+ linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+ rc=$?
+
+ if [[ $rc -ne 0 ]] ; then
+ eerror "To use g15daemon, you need to compile your kernel with uinput support."
+ eerror "Please enable uinput support in your kernel config, found at:"
+ eerror
+ eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+ eerror
+ eerror "Once enabled, you should have the /dev/input/uinput device."
+ eerror "g15daemon will not work without the uinput device."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ uinput_check
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ else
+ unpack ${A}
+ fi
+ if use perl; then
+ unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+ fi
+ if use python; then
+ unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+ fi
+}
+
+src_prepare() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_wc_info
+ fi
+ if use perl; then
+ perl-module_src_prepare
+ sed -i \
+ -e '1i#!/usr/bin/perl' \
+ "${S}"/contrib/testbindings.pl
+ else
+ # perl-module_src_prepare always calls base_src_prepare
+ base_src_prepare
+ fi
+ if [[ ${PV} = *9999* ]]; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_compile
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ # remove odd docs installed my make
+ rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+ insinto /usr/share/${PN}/contrib
+ doins contrib/xmodmaprc
+ doins contrib/xmodmap.sh
+ if use perl; then
+ doins contrib/testbindings.pl
+ fi
+
+ newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
+ dobin "${FILESDIR}/g15daemon-hotplug"
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}/99-g15daemon.rules"
+
+ insinto /etc
+ doins "${FILESDIR}"/g15daemon.conf
+
+ # Gentoo bug #301340, debian bug #611649
+ exeinto /usr/lib/pm-utils/sleep.d
+ doexe "${FILESDIR}"/20g15daemon
+
+ if use perl; then
+ ebegin "Installing Perl Bindings (G15Daemon.pm)"
+ cd "${WORKDIR}/G15Daemon-0.2"
+ docinto perl
+ perl-module_src_install
+ fi
+
+ if use python; then
+ ebegin "Installing Python Bindings (g15daemon.py)"
+ cd "${WORKDIR}/pyg15daemon"
+
+ python_foreach_impl python_domodule g15daemon.py
+
+ docinto python
+ dodoc AUTHORS
+ fi
+}
+
+pkg_postinst() {
+ elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+ elog "This can be done with:"
+ elog "# /sbin/rc-update add g15daemon default"
+ elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+ elog ""
+ elog "To have all new keys working in X11, you'll need create a "
+ elog "specific xmodmap in your home directory or edit the existent one."
+ elog ""
+ elog "Create the xmodmap:"
+ elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+ elog ""
+ elog "Adding keycodes to an existing xmodmap:"
+ elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
diff --git a/app-misc/g15daemon/metadata.xml b/app-misc/g15daemon/metadata.xml
new file mode 100644
index 000000000000..454edc63965e
--- /dev/null
+++ b/app-misc/g15daemon/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">g15daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/g15macro-1.0.3-r2 b/app-misc/g15macro-1.0.3-r2
deleted file mode 100644
index 2dc294e83c41..000000000000
--- a/app-misc/g15macro-1.0.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-libs/libXtst >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Macro recording plugin to G15daemon
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render x11-libs/libX11 x11-libs/libXtst sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/g15daemon/g15macro-1.0.3.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7da8d1c26ecf4aeadb93f42541eec30e
diff --git a/app-misc/g15macro/Manifest b/app-misc/g15macro/Manifest
new file mode 100644
index 000000000000..2da7333e12ec
--- /dev/null
+++ b/app-misc/g15macro/Manifest
@@ -0,0 +1,5 @@
+AUX g15macro-1.0.3-Makefile.am.patch 345 BLAKE2B d00da6975fd9a25a3ff6fd8272466e0472e9d1f97cf9a4e0c9af2455ed3ce382827a4ddfa7325f04a9351915a08d5b04b1afc98b03de834670ceb003160fe5a5 SHA512 234b05866e993ce4bf486f8e9b57166c481fdb2487a1a026664b9675a79061cf18c6fd2a0b9e68580823fff4c393b1cfb0048ff24a1ced779790f270918aa00c
+AUX g15macro-1.0.3-configure.in.patch 280 BLAKE2B 3b8f6aa6b5562e19c419e722abaad6f831ef410e1a678784f48bc79a73258d06a780fb8984b66421ef5d1ff9685968aeaabeab31c22edc6f571fc6712915996b SHA512 a754e925f6ab35615a768f2869fac784e987785bc42f3be7b7bb32999dbdc1a332118db644867e39e426fcfd6f143e277187b415c8f43dd6861f54c41ce3625e
+DIST g15macro-1.0.3.tar.gz 324859 BLAKE2B 66168090d6daa82c1a9ce3fb8b028316f12691b599fecc683d141a3584bcbf28e5169044d5baa0957c27e51d7634092bf65158da1106059ec87cdfa4f9fa7c36 SHA512 8497aea4a6c8df3b9015ce87c38c8ad20fc66c6b2b04368716a11130e09ef75e32ba9664b57fcda0f5d8a962653ba46e6f851e6e56110d89629765cf77fa751d
+EBUILD g15macro-1.0.3-r2.ebuild 781 BLAKE2B 0d475d9a4d347393929833e8dae183f81fd158846b4316400451bb82af5861d52bbd80b9efb0f2de5083f039a6969dd6247fb7de02702565c65dc08539b37221 SHA512 f5175f5dcc2ad71b03492690195a72d561784ec8e34ba6320cc6dbf84f4aa5bc2bf58947b529a3e96f649afca7d932a5efc2e48830270a102e0cdf04fffa4291
+MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch b/app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
new file mode 100644
index 000000000000..bc457dc52fbd
--- /dev/null
+++ b/app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,9 +10,8 @@
+ imagedir = $(prefix)/share/g15macro/splash
+ image_DATA = ${top_builddir}/g15macro.wbmp
+
+-LIBS = -lg15daemon_client -lg15render -lX11 -lXtst
++LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lpthread
+ IMCLUDES = -I
+-g15macro_LDFLAGS = -avoid-version
+ g15macro_SOURCES = g15macro.c
+
+
diff --git a/app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch b/app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
new file mode 100644
index 000000000000..7cdde1d098ec
--- /dev/null
+++ b/app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -8,7 +8,6 @@
+ AC_CONFIG_HEADER([config.h])
+
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
+ AC_PROG_RANLIB
+
+ AC_CHECK_LIB([g15daemon_client], [g15daemon_version],,AC_MSG_ERROR(["libg15daemon_client (or its devel package) not found. please install it"]))
diff --git a/app-misc/g15macro/g15macro-1.0.3-r2.ebuild b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..c86e4550bd28
--- /dev/null
+++ b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Macro recording plugin to G15daemon"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=app-misc/g15daemon-1.9.0
+ dev-libs/libg15
+ dev-libs/libg15render
+ x11-libs/libX11
+ x11-libs/libXtst
+"
+RDEPEND="${DEPEND}
+ sys-libs/zlib
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.am.patch
+ epatch "${FILESDIR}"/${P}-configure.in.patch
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf --enable-xtest
+}
+
+src_install() {
+ default
+ rm -rf "${ED}"/usr/share/doc/${P}
+}
diff --git a/app-misc/g15macro/metadata.xml b/app-misc/g15macro/metadata.xml
new file mode 100644
index 000000000000..454edc63965e
--- /dev/null
+++ b/app-misc/g15macro/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">g15daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/g15message-1.0.0-r1 b/app-misc/g15message-1.0.0-r1
deleted file mode 100644
index aada9f9df31a..000000000000
--- a/app-misc/g15message-1.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render sys-libs/zlib
-DESCRIPTION=A simple message/alert client for G15daemon
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/g15daemon/g15message-1.0.0.tar.bz2
-_md5_=990ecdea135156b81a4d36cb478f0ce3
diff --git a/app-misc/g15message/Manifest b/app-misc/g15message/Manifest
new file mode 100644
index 000000000000..fc9c0314d85b
--- /dev/null
+++ b/app-misc/g15message/Manifest
@@ -0,0 +1,3 @@
+DIST g15message-1.0.0.tar.bz2 219798 BLAKE2B 47320e9f43547756e3f427d917b76f816e5422ad65151e5b9cac72813a6a5c7233273c089e9bc2693c243d98bc612c0a2a824d7e6c84b2565f99c01f3034f476 SHA512 608fb789e1390e6f8fabe4c1f21cabfb0c445660a2629616ddca253d232d9e58775c8aeb8c44dde0b014e6e26cbab70db991000f1bfcb4daed1727a06de7a78f
+EBUILD g15message-1.0.0-r1.ebuild 466 BLAKE2B 13817da368acf6e69b7e132cfab56e416e31158d8fc6cfb47cf757e3cfb01b676617bab4e1287977e72c9099e0f9fda1632e04d1bd32ffda9e5d81995838a62b SHA512 14f41b0e97883870c74890dc05734bcdea84a658fd02abf832516026e6271534ed27f858b8dcec1950db674259c9898534584df3de09b883756ee20fd3ebdbb4
+MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15message/g15message-1.0.0-r1.ebuild b/app-misc/g15message/g15message-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..833b89120139
--- /dev/null
+++ b/app-misc/g15message/g15message-1.0.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple message/alert client for G15daemon"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-misc/g15daemon-1.9.0
+ dev-libs/libg15
+ dev-libs/libg15render
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
diff --git a/app-misc/g15message/metadata.xml b/app-misc/g15message/metadata.xml
new file mode 100644
index 000000000000..454edc63965e
--- /dev/null
+++ b/app-misc/g15message/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">g15daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/g15mpd-1.0.0-r1 b/app-misc/g15mpd-1.0.0-r1
deleted file mode 100644
index ed278e5928d8..000000000000
--- a/app-misc/g15mpd-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-misc/g15daemon-1.9 dev-libs/libg15 dev-libs/libg15render >=media-libs/libmpd-0.17 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MPD (music player daemon) plugin to G15daemon
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/g15daemon-1.9 dev-libs/libg15 dev-libs/libg15render >=media-libs/libmpd-0.17 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=mirror://sourceforge/g15daemon/g15mpd-1.0.0.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65212b6c3c5672d52b269a5a9ab69694
diff --git a/app-misc/g15mpd/Manifest b/app-misc/g15mpd/Manifest
new file mode 100644
index 000000000000..c4476e4107f4
--- /dev/null
+++ b/app-misc/g15mpd/Manifest
@@ -0,0 +1,5 @@
+AUX g15mpd-1.0.0-cflags-and-lib-fix.patch 746 BLAKE2B 9fce8bbfc245b8fafc638f31feca90dfa1939f6722c0ad31a8aec175c7f4ed9f755ca325e9309175d790a77012c76bd6cec7df29b0b13345ea0143aaa406c928 SHA512 79b24ec54f55741f7fb5a5a22a547e515b909e69253418de434c032179ed2a2f4e9397eabcc13de460d8c9219b3aeeafce387ba84cff17a79778ee151465b7c2
+AUX g15mpd-1.0.0-libmpd.patch 1460 BLAKE2B 360dd9412aecf2b805145263b9d021484eca3dfb966eec8b44857f263a5b5fbb31d17dfcec276d531c76ef4c1d1e4cdf32d598771b3c414df8bd2660bb6ea5b7 SHA512 240c82b84c4eba2095e6fcfd0e7da7fb54197afa600dcd0ce92b3eacc9f8907e69ac64e44dfa5314a29bc4db793f9e21f8efd44589c0a3c226426cd52445945e
+DIST g15mpd-1.0.0.tar.bz2 220482 BLAKE2B 82103773005566764bab5e8b583633a14b5103887ac7e4c3571cfc85064e483943189e6b4b76e8f3f3b7383d327b29a19b281f23364d3bcc18b10ef44de1e9b5 SHA512 509b634c8ba1f3b9efd0d7af47b553671efe3526c9acd44b292bf5883b1016cfbf18dec69c8bb5b3a35853e76b9b4fe7a51cd2a33acf4c755d2824dc793fa0ca
+EBUILD g15mpd-1.0.0-r1.ebuild 823 BLAKE2B 8023552468558f30ae1737d13b2eb27f4ff6f057b845f8631807ea9853f6e6b69432e28f5025aa478e0e04e9b3734666cae0b386f76ddd23455194b6490d9e7c SHA512 c3d0e6dbc656fba7c85ae7f43cfbc58e2ab43678d49ec662bb80740f166e573dff8cb9abd7bac4f301843e9bf999a000c78872f710f204228df83a42022affe9
+MISC metadata.xml 246 BLAKE2B a95774ec5f588845ea4765db8b51d75fe0b71c04129ddfba9706afca19ebf4fcefa5bcee0c71b295d270de24e8942142d2af9449a46b7407cfc24a5797fb6885 SHA512 b9fd89855ed25a0b766566521a33295c6d3f4469ba31da9fed2d4f133d3c56b1a59e7c4cc66171ebf6c8a9137ccded19a942072f80dcded8b7efcf0912fdfce1
diff --git a/app-misc/g15mpd/files/g15mpd-1.0.0-cflags-and-lib-fix.patch b/app-misc/g15mpd/files/g15mpd-1.0.0-cflags-and-lib-fix.patch
new file mode 100644
index 000000000000..5bdb1261f367
--- /dev/null
+++ b/app-misc/g15mpd/files/g15mpd-1.0.0-cflags-and-lib-fix.patch
@@ -0,0 +1,18 @@
+diff -ruN g15mpd-1.0.0/Makefile.am g15mpd-1.0.0-patched/Makefile.am
+--- g15mpd-1.0.0/Makefile.am 2014-01-17 13:43:28.536056492 -0500
++++ g15mpd-1.0.0-patched/Makefile.am 2014-01-17 13:43:31.596056410 -0500
+@@ -1,12 +1,12 @@
+ AM_CPPFLAGS = @libmpd_CFLAGS@
+-AM_CFLAGS = -O3 -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
++AM_CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
+ METASOURCES = AUTO
+ bin_PROGRAMS = g15mpd
+
+ docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+
+-LIBS = -lg15daemon_client -lg15render -lX11 -lXtst @libmpd_LIBS@
++LIBS = -lpthread -lg15daemon_client -lg15render -lX11 -lXtst @libmpd_LIBS@
+ IMCLUDES = -I
+ g15mpd_LDFLAGS = -avoid-version
+ g15mpd_SOURCES = g15mpd.c
diff --git a/app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch b/app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch
new file mode 100644
index 000000000000..57d2fb8a1ef6
--- /dev/null
+++ b/app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile.am b/Makefile.am
+index e407dab..6404618 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-
++AM_CPPFLAGS = @libmpd_CFLAGS@
+ AM_CFLAGS = -O3 -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
+ METASOURCES = AUTO
+ bin_PROGRAMS = g15mpd
+@@ -6,7 +6,7 @@ bin_PROGRAMS = g15mpd
+ docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+
+-LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lmpd
++LIBS = -lg15daemon_client -lg15render -lX11 -lXtst @libmpd_LIBS@
+ IMCLUDES = -I
+ g15mpd_LDFLAGS = -avoid-version
+ g15mpd_SOURCES = g15mpd.c
+diff --git a/configure.in b/configure.in
+index aaa361c..83281d0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -18,7 +18,9 @@ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(g15daemon_client.h libg15render.h,,AC_MSG_ERROR(["libg15daemon_client (or its devel package) could not be found. please install it"]))
+ AC_CHECK_HEADERS(X11/Xlib.h X11/XF86keysym.h,,AC_MSG_ERROR(["Xorg development files could not be found. please install the devel package"]))
+ AC_CHECK_HEADERS(X11/extensions/XTest.h,,AC_MSG_ERROR(["Xorg XTEST Extension devel headers could not be found. please install the devel package"]))
+-AC_CHECK_HEADERS(libmpd/libmpd.h,,AC_MSG_ERROR(["libmpd development files could not be found. please install the libmpd devel package"]))
++PKG_CHECK_MODULES([libmpd], [libmpd])
++AC_SUBST(libmpd_LIBS)
++AC_SUBST(libmpd_CFLAGS)
+ AC_PATH_X
+
+ AC_OUTPUT(Makefile)
diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..13ecc8900f6a
--- /dev/null
+++ b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="MPD (music player daemon) plugin to G15daemon"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ >=app-misc/g15daemon-1.9
+ dev-libs/libg15
+ dev-libs/libg15render
+ >=media-libs/libmpd-0.17
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-libmpd.patch
+ epatch "${FILESDIR}/${PN}-1.0.0-cflags-and-lib-fix.patch"
+ eautoreconf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
+}
diff --git a/app-misc/g15mpd/metadata.xml b/app-misc/g15mpd/metadata.xml
new file mode 100644
index 000000000000..15d0bf7cfc4a
--- /dev/null
+++ b/app-misc/g15mpd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">g15daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/g15stats-1.9.7 b/app-misc/g15stats-1.9.7
deleted file mode 100644
index 9312423b4b51..000000000000
--- a/app-misc/g15stats-1.9.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render sys-libs/zlib gnome-base/libgtop virtual/pkgconfig
-DESCRIPTION=CPU, memory, swap, network stats for G15 Keyboard
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/g15daemon/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/g15daemon-1.9.0 dev-libs/libg15 dev-libs/libg15render sys-libs/zlib gnome-base/libgtop
-SLOT=0
-SRC_URI=mirror://sourceforge/g15daemon/g15stats-1.9.7.tar.bz2
-_md5_=d5a698d191f2b375fc70f055cb9a0382
diff --git a/app-misc/g15stats/Manifest b/app-misc/g15stats/Manifest
new file mode 100644
index 000000000000..8f16c5b98a20
--- /dev/null
+++ b/app-misc/g15stats/Manifest
@@ -0,0 +1,5 @@
+AUX g15stats-1.9.7.confd 637 BLAKE2B d85597aba7b14048078a60a8b7e8d2c782f499d649d30c5c48ae09bc545a2ae1642ab1776d119a1d6fddb7317c94e13d85a888c09507608257bd0ac7b3ec37a5 SHA512 f31ea949d3bdc1c8c18628f31ef0252a8d07a636055bff493cc368db702aea2d0d23b6b812d16040cd0015c1daf25357e29149d74e0bb3f233560a15df5ca58c
+AUX g15stats-1.9.7.initd 496 BLAKE2B 52bed11f8b0c9c084c1e1c313ea629cfbde5964b21f6bf7a8667544de6e702cb4b5a89a4022d66d53abfb6f4c14b43669bef290ab6041720e193b96f9b9482b8 SHA512 ad61ddfdbd60bf8906c6ee114ed01385bc20480225579a2034296231feb211eddc48fe8a088ea314822972f80a6df12d3f5bbea44e4e649ea7156b241457ff34
+DIST g15stats-1.9.7.tar.bz2 24103 BLAKE2B ead6f95c1e320b975a0d3ace2c76c1244e5c36b5df60bb73133d19c2bab4f21e1a9d1c423baa9d87feae166861734c02fa60d7ec2e06a0ab764b77a0e00c7ba5 SHA512 de447dfddd563513205b29b3611b0558371b2a7fbe7bf3aa11cd997c0ee2767b3aba05df9745d15e5c0b81382b96163fb7d33ba6a77e04ac817c7a8e26e228ff
+EBUILD g15stats-1.9.7.ebuild 939 BLAKE2B f9505b164e560495aa5c6b767c6bbfd6cbcba0d334f01ddbab08366278a573731a6b6bd7460b5dd38300d329ff48413d89d823b6311dd1415b5c3b79dad76830 SHA512 4af56d975440631a8494737e2ce412811550ff24348a8ea3335c56036ae3cab6aaea7ab6f88ceb4f5c91b8684755359a5ad403e681b2ec9ced3dc6286e0ab017
+MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15stats/files/g15stats-1.9.7.confd b/app-misc/g15stats/files/g15stats-1.9.7.confd
new file mode 100644
index 000000000000..4bf61c238488
--- /dev/null
+++ b/app-misc/g15stats/files/g15stats-1.9.7.confd
@@ -0,0 +1,20 @@
+# /etc/conf.d/g15stats: Configuration for the G15 stats
+
+#Gather statistics from named interface (ie eth0)
+#Network Screen displays Total bytes In/Out, history graph, Peak speed.
+IFACE="eth0"
+
+# Please see g15stats --help for meanings
+#TEMP_INPUT=1
+#GLOBAL_TEMP_INPUT=1
+#FAN_INPUT=1
+
+# please see g15stats --help for all options
+# As of 1.9.7, the options where:
+# --unicore
+# --net-scale-absolute
+# --info-rotate
+# --variable-cpu
+# --refresh
+# --disable-freq
+EXTRA_OPTS="${IFACE:+--interface} ${IFACE} ${TEMP_INPUT:+--temperature} ${TEMP_INPUT} ${GLOBAL_TEMP_INPUT:+--global-temp} ${GLOBAL_TEMP_INPUT} ${FAN_INPUT:+--fan} ${FAN_INPUT}"
diff --git a/app-misc/g15stats/files/g15stats-1.9.7.initd b/app-misc/g15stats/files/g15stats-1.9.7.initd
new file mode 100644
index 000000000000..56a77d328ed4
--- /dev/null
+++ b/app-misc/g15stats/files/g15stats-1.9.7.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+ need g15daemon
+ after xdm
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --background --make-pidfile --pidfile ${PIDFILE} --exec \
+ /usr/bin/g15stats -- "${EXTRA_OPTS}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stoping ${SVCNAME}"
+ start-stop-daemon --stop --pidfile ${PIDFILE} --name g15stats
+ eend $?
+}
diff --git a/app-misc/g15stats/g15stats-1.9.7.ebuild b/app-misc/g15stats/g15stats-1.9.7.ebuild
new file mode 100644
index 000000000000..d28c95aee6ee
--- /dev/null
+++ b/app-misc/g15stats/g15stats-1.9.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="CPU, memory, swap, network stats for G15 Keyboard"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-misc/g15daemon-1.9.0
+ dev-libs/libg15
+ dev-libs/libg15render
+ sys-libs/zlib
+ gnome-base/libgtop"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ sh autogen.sh
+}
+
+src_configure() {
+ export CPPFLAGS=$CFLAGS
+ econf
+}
+
+src_compile() {
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+ rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
+
+ newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}-1.9.7.initd" ${PN}
+}
+
+pkg_postinst() {
+ elog "Remember to set the interface you want monitored in"
+ elog "/etc/conf.d/g15stats"
+}
diff --git a/app-misc/g15stats/metadata.xml b/app-misc/g15stats/metadata.xml
new file mode 100644
index 000000000000..454edc63965e
--- /dev/null
+++ b/app-misc/g15stats/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">g15daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gcal-3.6.3 b/app-misc/gcal-3.6.3
deleted file mode 100644
index 76ae3a0c7fec..000000000000
--- a/app-misc/gcal-3.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
-DESCRIPTION=The GNU Calendar - a replacement for cal
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gcal/
-IUSE=ncurses nls unicode
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/gcal/gcal-3.6.3.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9b8ffdb83377d276a73763dd4d7a94f
diff --git a/app-misc/gcal-4.1 b/app-misc/gcal-4.1
deleted file mode 100644
index e77e6d690b20..000000000000
--- a/app-misc/gcal-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 ) unicode? ( dev-libs/libunistring:= )
-DESCRIPTION=The GNU Calendar - a replacement for cal
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gcal/
-IUSE=ncurses nls unicode
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=nls? ( virtual/libintl ) unicode? ( dev-libs/libunistring:= )
-SLOT=0
-SRC_URI=mirror://gnu/gcal/gcal-4.1.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8e2a317d4f69531ff8057b8c2512867
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
new file mode 100644
index 000000000000..2c08573bb65a
--- /dev/null
+++ b/app-misc/gcal/Manifest
@@ -0,0 +1,5 @@
+DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
+DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
+EBUILD gcal-3.6.3.ebuild 755 BLAKE2B 587f11c595be77c84acb9d7f9fe14be92b76721205e7e0ca3491440d98f37ddc34d4bd973833b1ee1af32a80a9719773e57291b6375900336973e73665d10057 SHA512 56331663a9c6e1ebee5b6acaf66ce3635c8524e6cbee8604c134ec0df68ef4577b89a7c839885102bed0986e9623cf7a60947e8159e2b6687d3cbc04b3bf07e5
+EBUILD gcal-4.1.ebuild 868 BLAKE2B 09ee0f85e3dc79ad692b952e7f189d525682b57e93c8233bf0d8b14c7a291a46390b9d19421cd4dfcc81e7746f0074162326caafcecaabe5e259b6f10b903304 SHA512 306c9790470d422c09f5536f24ae643f2c2ba8c36817aaae361615d89c559c19d5c6618859539776567e8e2a4833d706cc0765ee616c0cdaf99537fa51a2d14d
+MISC metadata.xml 1018 BLAKE2B cb75f985009092bb5b22cc15d4ad11da0f049d6b4fe1ac02479a73d5333102a0abe0a80f7673b408d6991b9c1c862706279a25abbd071f9faf3c1d012d69ecc1 SHA512 44362e0e9926b26bab6a3eef736bb8e6c1d76e33f94ec546a97bde251a5e03d8102d3f17ea48a20f18da957c325b766647e3574bd8e13f0f070a15b105d07ea3
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
new file mode 100644
index 000000000000..ef7714001f50
--- /dev/null
+++ b/app-misc/gcal/gcal-3.6.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Calendar - a replacement for cal"
+HOMEPAGE="https://www.gnu.org/software/gcal/"
+SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ncurses nls unicode"
+
+DEPEND="
+ app-arch/xz-utils
+ nls? ( >=sys-devel/gettext-0.17 )"
+RDEPEND="nls? ( virtual/libintl )"
+
+DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
+
+src_configure() {
+ tc-export CC
+ append-cppflags -D_GNU_SOURCE
+ econf \
+ --disable-rpath \
+ $(use_enable nls) \
+ $(use_enable ncurses term) \
+ $(use_enable unicode)
+}
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
new file mode 100644
index 000000000000..7f56acee8cae
--- /dev/null
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Calendar - a replacement for cal"
+HOMEPAGE="https://www.gnu.org/software/gcal/"
+SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ncurses nls unicode"
+
+DEPEND="
+ app-arch/xz-utils
+ nls? ( >=sys-devel/gettext-0.17 )
+ unicode? ( dev-libs/libunistring:= )"
+
+RDEPEND="nls? ( virtual/libintl )
+ unicode? ( dev-libs/libunistring:= )"
+
+DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
+
+src_configure() {
+ tc-export CC
+ append-cppflags -D_GNU_SOURCE
+ use unicode && append-libs -lunistring
+ econf \
+ --disable-rpath \
+ $(use_enable nls) \
+ $(use_enable ncurses term) \
+ $(use_enable unicode)
+}
diff --git a/app-misc/gcal/metadata.xml b/app-misc/gcal/metadata.xml
new file mode 100644
index 000000000000..1c58cf2c7909
--- /dev/null
+++ b/app-misc/gcal/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription>
+ Gcal is a program similar the standard calendar programs BSD "cal" and
+ "calendar". Gcal displays hybrid and proleptic Julian and Gregorian calendar
+ sheets, respectively, for one month, three months or a whole year. It also
+ displays eternal holiday lists for many countries around the globe, and
+ features a very powerful creation of fixed date lists that can be used for
+ reminding purposes. Gcal can calculate various astronomical data and times
+ of the Sun and the Moon for at pleasure any location, precisely enough for
+ most civil purposes. Gcal supports some other calendar systems, for example
+ the Chinese and Japanese calendar, the Hebrew calendar and the civil Islamic
+ calendar, too.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/gcalcli-3.2 b/app-misc/gcalcli-3.2
deleted file mode 100644
index e2c6565174d2..000000000000
--- a/app-misc/gcalcli-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/vobject[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=5
-HOMEPAGE=https://github.com/insanum/gcalcli
-IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/vobject[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v3.2.tar.gz -> gcalcli-3.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f40c15ed586fe10492475bdf648eed1
diff --git a/app-misc/gcalcli-3.3.2 b/app-misc/gcalcli-3.3.2
deleted file mode 100644
index 17d524079e53..000000000000
--- a/app-misc/gcalcli-3.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/vobject[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=5
-HOMEPAGE=https://github.com/insanum/gcalcli
-IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/vobject[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v3.3.2.tar.gz -> gcalcli-3.3.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f40c15ed586fe10492475bdf648eed1
diff --git a/app-misc/gcalcli-3.4.0 b/app-misc/gcalcli-3.4.0
deleted file mode 100644
index c6e8b2814eb5..000000000000
--- a/app-misc/gcalcli-3.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=5
-HOMEPAGE=https://github.com/insanum/gcalcli
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v3.4.0.tar.gz -> gcalcli-3.4.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4dc65e9e4ccd0cdd6ef0e406b36ae3cc
diff --git a/app-misc/gcalcli-4.0.0_alpha3 b/app-misc/gcalcli-4.0.0_alpha3
deleted file mode 100644
index 97316a9fb2aa..000000000000
--- a/app-misc/gcalcli-4.0.0_alpha3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/google-api-python-client[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/vobject[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=5
-HOMEPAGE=https://github.com/insanum/gcalcli
-IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/google-api-python-client[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/vobject[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v4.0.0a3.tar.gz -> gcalcli-4.0.0_alpha3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a19ee67ab30b3e9da33dfc152be3ae37
diff --git a/app-misc/gcalcli-4.0.0_alpha3-r1 b/app-misc/gcalcli-4.0.0_alpha3-r1
deleted file mode 100644
index 95d5808f284b..000000000000
--- a/app-misc/gcalcli-4.0.0_alpha3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=5
-HOMEPAGE=https://github.com/insanum/gcalcli
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v4.0.0a3.tar.gz -> gcalcli-4.0.0_alpha3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ccad19620b3b441c7b78b3f64cb02cde
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
new file mode 100644
index 000000000000..45c56cc322f2
--- /dev/null
+++ b/app-misc/gcalcli/Manifest
@@ -0,0 +1,11 @@
+AUX gcalcli-oauth2client.patch 1306 BLAKE2B a853208d6420a7e39ad66e796d3877a5ed538934f22beb3752ae56d92de0958d68bad4501cd03ee861c91d62553b7df98c86b78f694d976ce0d0116109172f9b SHA512 6028e8ebe14b763421889621576367838112d2cf56dc85a424dfcdad540a8d7c8010b7f48361a5317552ef827d4922c436922d0b34b9fe7f07eb69300f3a977e
+DIST gcalcli-3.2.tar.gz 1672457 BLAKE2B f54e90cbff2676238a4e5d41fd5d2935b48358748655b4817e785abcd2bee0f50bce99a4c1e8b17d6e5d34c0ef8e2a4649d044de55ff45844656928550de2883 SHA512 a2e0d9aea2f27eaee3796acfbfdc08b88a7792002b10f0e44b0db1187a7ecd50aa97f78df7236038c8c18bc1b6dacbfa4b26db6bfb5762c880415c10a5364d83
+DIST gcalcli-3.3.2.tar.gz 1674569 BLAKE2B c141bdba5a337ebc4ecc81f845c66281ad3d5b5442a664f195bfdcf866eb1c0a1f7c395808d939caacbf8af74bf8f2cd25b35815b72ca92beb2b7861de4a1ade SHA512 725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0
+DIST gcalcli-3.4.0.tar.gz 1675456 BLAKE2B 38ac6eed8e03f806fa2311389c4fc3377ae16ee95af8d42d15eedfa37599d56d56c0b950e1eabb1968e4270657a5af70f789eb9e86d01baea35c9f84b13f6d69 SHA512 d3844dc34dfd21b1cca6f46bf2b66b6aabfccd4d7b23ad4e076966aeec51681792c0dbe5f61e4cb84a75ce3bbf4fd1c63a2ce759cecdeee3e4608c0238c07a4b
+DIST gcalcli-4.0.0_alpha3.tar.gz 1675261 BLAKE2B 8388e489abd21a916568c9a39e1b41875613656ff60fbf6b555bf22408619e940512405c89615eb9477a20c5443e5d7d1c714905df86da4d76d1eede033daf01 SHA512 215860f50d2b32b94124537b3d8dbaebd7af5b9c907d565a58eab5357efa8a8c8bc6c20264811337ddbc33ae75029bf59c782e1dbb317667084f11da8c41ea18
+EBUILD gcalcli-3.2.ebuild 815 BLAKE2B c8e990365032205d0e6665747a8d56eaab422db3c0e7e92bc9b3b17e40de7443dd980e344e042d6e4a2dd09b9d8a52f4c3a08ac941397b10ad19e3aa2c3d45fd SHA512 992baf956a14895ec81a378bb55958c8d1b5beee8b0265cc37456dd39d18d66968a450082820832c5b04c6964c6e28e3d4bfe25973540786ea2693c49c3d30d3
+EBUILD gcalcli-3.3.2.ebuild 815 BLAKE2B c8e990365032205d0e6665747a8d56eaab422db3c0e7e92bc9b3b17e40de7443dd980e344e042d6e4a2dd09b9d8a52f4c3a08ac941397b10ad19e3aa2c3d45fd SHA512 992baf956a14895ec81a378bb55958c8d1b5beee8b0265cc37456dd39d18d66968a450082820832c5b04c6964c6e28e3d4bfe25973540786ea2693c49c3d30d3
+EBUILD gcalcli-3.4.0.ebuild 922 BLAKE2B 3a16e34f4a14caf8c65051cc6c5a4bbb8a4afa7c1b4f30a1dd8b1ca629043ab9d84f283c5717f07bc622697035db79f379732918bcd8bce93a4035a61fd7a6ff SHA512 578c55f37ca24694410fca8875b7523c5f84b375408f44afc84254d2074df7c0033243ff127765b3673acb5a4a1aadae88f819e1fb9317c338ffb68eee8e55b7
+EBUILD gcalcli-4.0.0_alpha3-r1.ebuild 993 BLAKE2B b1fac1d55ca70ae50d96943ceec2ccbb181fcb75e614a2a1f415f78f4bf602f3caf34427b5fa38f0b53cceae60595a8b2fb04aa9f51e639d1563941b5e9abd14 SHA512 cf6d503c7879b0b434aaed44743ee99be5af8f48009f92c5a44677fcf8add533307c93741eacca5687220a2295f8547834f59741e4aaebb319fcb5a521c8523f
+EBUILD gcalcli-4.0.0_alpha3.ebuild 872 BLAKE2B 82a8e8d765daff00c0b05adf161acecd6584a43918721c9048fb7f6c54a49bee8c8b2f34b46a7296b7d6640a65e26e78c4e45085b3bd9c774c932acb381b5b7b SHA512 7b46807216c42f4129908bc96f71d365f97dfe06e1b95a3124b2812943e6c55423b25cd2543e3ebdbcb67b9c2c6f8ee0a9d8f446c8fb226adddd1ee0ac50c2de
+MISC metadata.xml 340 BLAKE2B 206e5c230d6379249a0cd6e99bc41cd3246cd37dd3766be939b5fea135664b63e9cf1aa92e24f035be65f0553f7f7cfbc8a460391f52119aa1f052399c05ea33 SHA512 4d2abd6d07db32d501923eef6b9aa7752b844745a0511a36801480833dd205adef443bea80efa86d270cdd6d0edda16a9989d678221d0b480366a47a7c76de02
diff --git a/app-misc/gcalcli/files/gcalcli-oauth2client.patch b/app-misc/gcalcli/files/gcalcli-oauth2client.patch
new file mode 100644
index 000000000000..2ad7a2981f82
--- /dev/null
+++ b/app-misc/gcalcli/files/gcalcli-oauth2client.patch
@@ -0,0 +1,30 @@
+--- a/gcalcli-3.3.2/gcalcli 2015-09-14 02:26:55.000000000 -0300
++++ b/gcalcli-3.3.2/gcalcli 2016-09-21 00:20:45.817051537 -0300
+@@ -190,7 +190,8 @@
+ from apiclient.errors import HttpError
+ from oauth2client.file import Storage
+ from oauth2client.client import OAuth2WebServerFlow
+- from oauth2client.tools import run
++ from oauth2client.tools import run_flow
++ from oauth2client.tools import argparser
+ except ImportError as e:
+ print "ERROR: Missing module - %s" % e.args[0]
+ sys.exit(1)
+@@ -665,14 +666,15 @@
+ credentials = storage.get()
+
+ if credentials is None or credentials.invalid:
+- credentials = run(
++ args, unknown = argparser.parse_known_args(sys.argv)
++ credentials = run_flow(
+ OAuth2WebServerFlow(
+ client_id=self.client_id,
+ client_secret=self.client_secret,
+ scope=['https://www.googleapis.com/auth/calendar',
+ 'https://www.googleapis.com/auth/urlshortener'],
+ user_agent=__program__ + '/' + __version__),
+- storage)
++ storage,args)
+
+ self.authHttp = credentials.authorize(httplib2.Http())
+
diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild b/app-misc/gcalcli/gcalcli-3.2.ebuild
new file mode 100644
index 000000000000..5278106779aa
--- /dev/null
+++ b/app-misc/gcalcli/gcalcli-3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# google-api-python-client only supports these
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit python-r1
+
+DESCRIPTION="Google Calendar Command Line Interface"
+HOMEPAGE="https://github.com/insanum/gcalcli"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+ dev-python/gdata[${PYTHON_USEDEP}]
+ dev-python/vobject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ dodoc -r ChangeLog README.md docs
+ python_foreach_impl python_doscript ${PN}
+}
diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
new file mode 100644
index 000000000000..5278106779aa
--- /dev/null
+++ b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# google-api-python-client only supports these
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit python-r1
+
+DESCRIPTION="Google Calendar Command Line Interface"
+HOMEPAGE="https://github.com/insanum/gcalcli"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+ dev-python/gdata[${PYTHON_USEDEP}]
+ dev-python/vobject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ dodoc -r ChangeLog README.md docs
+ python_foreach_impl python_doscript ${PN}
+}
diff --git a/app-misc/gcalcli/gcalcli-3.4.0.ebuild b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
new file mode 100644
index 000000000000..43c611febff7
--- /dev/null
+++ b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# python-gflags doesn't support python3
+# parsedatetime doesn't support pypy
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Google Calendar Command Line Interface"
+HOMEPAGE="https://github.com/insanum/gcalcli"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+ dev-python/parsedatetime[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/python-gflags[${PYTHON_USEDEP}]
+ dev-python/vobject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/gcalcli-oauth2client.patch"
+}
+
+src_install() {
+ dodoc -r ChangeLog README.md docs
+ python_foreach_impl python_doscript ${PN}
+}
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
new file mode 100644
index 000000000000..ee26100ef277
--- /dev/null
+++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# python-gflags doesn't support python3
+# parsedatetime doesn't support pypy
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 versionator
+
+MY_PV="4.0.0a3"
+
+DESCRIPTION="Google Calendar Command Line Interface"
+HOMEPAGE="https://github.com/insanum/gcalcli"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/gdata[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+ dev-python/parsedatetime[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/python-gflags[${PYTHON_USEDEP}]
+ dev-python/vobject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/gcalcli-${MY_PV}"
+
+src_install() {
+ dodoc -r ChangeLog README.md docs
+ python_foreach_impl python_doscript ${PN}
+}
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
new file mode 100644
index 000000000000..c4ebdd93fa56
--- /dev/null
+++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# google-api-python-client only supports these
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit python-r1 versionator
+
+MY_PV="4.0.0a3"
+
+DESCRIPTION="Google Calendar Command Line Interface"
+HOMEPAGE="https://github.com/insanum/gcalcli"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/google-api-python-client[${PYTHON_USEDEP}]
+ dev-python/gdata[${PYTHON_USEDEP}]
+ dev-python/vobject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/gcalcli-${MY_PV}"
+
+src_install() {
+ dodoc -r ChangeLog README.md docs
+ python_foreach_impl python_doscript ${PN}
+}
diff --git a/app-misc/gcalcli/metadata.xml b/app-misc/gcalcli/metadata.xml
new file mode 100644
index 000000000000..abed7bc8eb66
--- /dev/null
+++ b/app-misc/gcalcli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">insanum/gcalcli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gcstar-1.7.0 b/app-misc/gcstar-1.7.0
deleted file mode 100644
index f375a09796ce..000000000000
--- a/app-misc/gcstar-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl ) >=sys-apps/sed-4
-DESCRIPTION=Manage your collections of movies, games, books, music and more
-EAPI=4
-HOMEPAGE=http://www.gcstar.org/
-IUSE=cddb gnome mp3 spell stats tellico vorbis
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/gcstar/gcstar-1.7.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b935c7677395e2e490d9e4748a23b9c0
diff --git a/app-misc/gcstar-1.7.1 b/app-misc/gcstar-1.7.1
deleted file mode 100644
index 5f6b90b0e3e1..000000000000
--- a/app-misc/gcstar-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl ) >=sys-apps/sed-4
-DESCRIPTION=Manage your collections of movies, games, books, music and more
-EAPI=6
-HOMEPAGE=http://www.gcstar.org/
-IUSE=cddb gnome mp3 spell stats tellico vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
-SLOT=0
-SRC_URI=https://launchpad.net/gcstar/1.7/1.7.1/+download/gcstar-1.7.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd581bf7e2e7bd9ee3906078ce534bd9
diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
new file mode 100644
index 000000000000..8fe7d1c2cd83
--- /dev/null
+++ b/app-misc/gcstar/Manifest
@@ -0,0 +1,7 @@
+AUX gcstar-1.4.0-man.patch 902 BLAKE2B 092a745eaa409c8b4c8b44244c99f4012d9eaa25c530b7731ec8e1ee5750b62b25c518917afe112c520f8f38c1ac8d09c88305a4048a34203b4fcb3257194eaf SHA512 eb1f1ec1822927b5885350fd69f26e599afebe240cfdc01adde27894f37ebdfa2fe14fd0e5cda3e0f12acea622d852d5442fef1f08b4ab8e8238b9d1d5b56482
+AUX gcstar-1.7.0-gcstar.desktop.patch 796 BLAKE2B 052d2d3325c04e1d8bb64951cfa43b44d1fa85f7c11326e2d56b04e8c5a57e70dc7b5a6758ae27186b403d27a4fd3d1ffc903c761c7a0a98b7430c4ef3602d56 SHA512 59ef9e55ffd607723b0cf833bf666ea4661db3af14b45425ba4b55de1d6144714eddf4cdbe17caddfa5a2876772c5c387a0fd06354c44fc8f3b26b83bba56150
+DIST gcstar-1.7.0.tar.gz 4506937 BLAKE2B dfc6f53921ecad73676fb9943f87dfb3c465347e4d4783f1efc29ec75c35eb56ecf97f9eba6121eb22740642d186d642a3384c10ea8ef6a8b42664e1c2a056e3 SHA512 9cb22a7ee38bbeae67ffc6f649ef6e988da43a1f353b027bacbf14ffcca8a4c12ef28d64876b2171396315eae95f76708a1307255eabc3eed6776137e2ae7090
+DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
+EBUILD gcstar-1.7.0.ebuild 2983 BLAKE2B 5dea9b2b2e74043d0c015bd975cf2b84cc928862f871c8c0833dfa92ef7db4f13d99de145987aead78281a1936199b3efe7059756a90cb72c1b2ff85c130a69f SHA512 dda33ea7ecd94915c9777448fffca7768f53e12e85af730a1b1e9af343a7596d6319a06b6ba9f58a38cefa0db8d972cbae43f17a0fdb52e238480bf03c523b4c
+EBUILD gcstar-1.7.1.ebuild 2172 BLAKE2B d6b0641fcaa802947c08096c8a4eac18ba7615a7d0a30fdabb048be8dddbb4140355bc4bd5ddef33eb3054b2d08eb08fd86fe0a2a804a4724c3c844ad9ac280f SHA512 99e26e221e53648586be1dacde738076d1a3d434d57d7f83f1183201d504dd3582b8e079595a5ce095368bafa4d1a362a2659d66bc53bdcbf1a09ce28baaec8d
+MISC metadata.xml 967 BLAKE2B 94301ae3ebb8b7f8339f09c9e0d490a4c46e9a35eadb3eb2cd209ed292a6fc546faa41995bee4cbacfbd76445fdeffa78075377ecab0b2625e45b2fd283abc65 SHA512 0a7c5e4cd287e6c7d9f6bcbb3e406a19511410e3ea7498ff11fe00df89739bff959b0a1af38410f9a226fe850005bf0b604b3c2c0690adf5ba75fcfcd86183a0
diff --git a/app-misc/gcstar/files/gcstar-1.4.0-man.patch b/app-misc/gcstar/files/gcstar-1.4.0-man.patch
new file mode 100644
index 000000000000..dfcade74c740
--- /dev/null
+++ b/app-misc/gcstar/files/gcstar-1.4.0-man.patch
@@ -0,0 +1,26 @@
+Install man files in /usr/share/man, not /usr/man
+
+--- gcstar/install 2008-03-04 22:56:00.000000000 -0500
++++ gcstar-1.4.0/install 2008-06-06 18:16:17.819918815 -0400
+@@ -107,7 +107,7 @@
+ }
+
+ unlink $baseDir.'/bin/'.$binName;
+- unlink $baseDir.'/man/man1/'.$binName.'.1.gz';
++ unlink $baseDir.'/share/man/man1/'.$binName.'.1.gz';
+
+ # remove menu and mime items
+
+@@ -187,9 +187,9 @@
+ mkpath $baseDir.'/bin';
+ copy 'bin/gcstar', $baseDir.'/bin/'.$binName;
+
+- verbosePrint $lang{InstallCopyDirectory}, $baseDir.'/man/man1';
+- mkpath $baseDir.'/man/man1';
+- my $manPage = "$baseDir/man/man1/$binName.1";
++ verbosePrint $lang{InstallCopyDirectory}, $baseDir.'/share/man/man1';
++ mkpath $baseDir.'/share/man/man1';
++ my $manPage = "$baseDir/share/man/man1/$binName.1";
+ copy 'man/gcstar.1', $manPage;
+ `gzip -f $manPage 2>&1 >/dev/null`;
+
diff --git a/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch b/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch
new file mode 100644
index 000000000000..62b6a7b47401
--- /dev/null
+++ b/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch
@@ -0,0 +1,23 @@
+From e78617436de63141cd4ff6e42fc0391a9a00d80a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 8 Sep 2012 18:14:40 -0400
+Subject: [PATCH] gcstar.desktop: MimeType list must be terminated with ';'
+
+Needed for gcstar.desktop to pass validation with desktop-file-utils-0.20
+---
+ gcstar/share/applications/gcstar.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcstar/share/applications/gcstar.desktop b/gcstar/share/applications/gcstar.desktop
+index aa6a46d..c7a146e 100644
+--- a/gcstar/share/applications/gcstar.desktop
++++ b/gcstar/share/applications/gcstar.desktop
+@@ -15,4 +15,4 @@ Terminal=false
+ StartupNotify=true
+ Type=Application
+ Categories=Office;
+-MimeType=application/x-gcstar
++MimeType=application/x-gcstar;
+--
+1.7.12
+
diff --git a/app-misc/gcstar/gcstar-1.7.0.ebuild b/app-misc/gcstar/gcstar-1.7.0.ebuild
new file mode 100644
index 000000000000..0eb9c9eb8cc6
--- /dev/null
+++ b/app-misc/gcstar/gcstar-1.7.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Manage your collections of movies, games, books, music and more"
+HOMEPAGE="http://www.gcstar.org/"
+# Gna permanently shut down in May 2017
+# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cddb gnome mp3 spell stats tellico vorbis"
+
+RDEPEND="dev-lang/perl
+ dev-perl/Archive-Zip
+ dev-perl/DateTime-Format-Strptime
+ dev-perl/Gtk2
+ dev-perl/HTML-Parser
+ dev-perl/libwww-perl
+ dev-perl/URI
+ dev-perl/XML-Parser
+ dev-perl/XML-Simple
+ virtual/perl-Archive-Tar
+ virtual/perl-Encode
+ virtual/perl-Getopt-Long
+ virtual/perl-File-Path
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ virtual/perl-IO-Compress
+ virtual/perl-libnet
+ virtual/perl-Storable
+ virtual/perl-Time-Piece
+
+ cddb? ( dev-perl/Net-FreeDB )
+ gnome? ( dev-perl/gnome2-vfs-perl )
+ mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
+ spell? ( dev-perl/gtk2-spell )
+ stats? ( dev-perl/Date-Calc
+ dev-perl/GD[png,truetype] )
+ tellico? ( virtual/perl-Digest-MD5
+ virtual/perl-MIME-Base64 )
+ vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.4.0-man.patch"
+ epatch "${FILESDIR}/${P}-gcstar.desktop.patch"
+}
+
+src_install() {
+ if [[ -n ${LINGUAS+set} ]]; then
+ # LINGUAS is set, let's try to respect it.
+ pushd lib/gcstar/GCLang > /dev/null
+
+ mkdir tmp || die "mkdir failed"
+ mv ?? ZH_CN tmp || die "mv 1 failed"
+ # English version should be always available so we will keep it
+ mv tmp/EN . || die "mv 2 failed"
+
+ for x in ${LINGUAS}; do
+ if [[ ${x} = "zh_CN" ]]; then
+ mv "tmp/ZH_CN" . || die "mv 3 failed"
+ else
+ # GCstar uses upper-case, 2-letter language codes
+ d=$(echo ${x} | tr '[:lower:]' '[:upper:]' | sed -e 's:_.*::')
+ if [[ -d "tmp/${d}" ]]; then
+ mv "tmp/${d}" . || die "mv 5 failed"
+ fi
+ fi
+ done
+
+ rm -rf tmp
+ popd > /dev/null
+ fi
+
+ # Yes, ED *is* needed here. gcstar's install lacks any concept of DESTDIR.
+ ./install --prefix="${ED}usr" \
+ --noclean --nomenu || die "install script failed"
+
+ domenu share/applications/gcstar.desktop
+ for size in 16 22 24 32 36 48 64 72 96 128 256
+ do
+ insinto /usr/share/icons/hicolor/${size}x${size}/apps
+ newins share/gcstar/icons/gcstar_${size}x${size}.png gcstar.png
+ done
+ insinto /usr/share/icons/hicolor/scalable/apps
+ newins share/gcstar/icons/gcstar_scalable.svg gcstar.svg
+ insinto /usr/share/mime/packages
+ doins share/applications/gcstar.xml
+
+ dodoc CHANGELOG README README.fr
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/gcstar/gcstar-1.7.1.ebuild b/app-misc/gcstar/gcstar-1.7.1.ebuild
new file mode 100644
index 000000000000..afc8b8f716ae
--- /dev/null
+++ b/app-misc/gcstar/gcstar-1.7.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop xdg-utils gnome2-utils
+
+DESCRIPTION="Manage your collections of movies, games, books, music and more"
+HOMEPAGE="http://www.gcstar.org/"
+# Gna permanently shut down in May 2017
+# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
+SRC_URI="https://launchpad.net/gcstar/1.7/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb gnome mp3 spell stats tellico vorbis"
+
+RDEPEND="dev-lang/perl
+ dev-perl/Archive-Zip
+ dev-perl/DateTime-Format-Strptime
+ dev-perl/Gtk2
+ dev-perl/HTML-Parser
+ dev-perl/libwww-perl
+ dev-perl/URI
+ dev-perl/XML-Parser
+ dev-perl/XML-Simple
+ virtual/perl-Archive-Tar
+ virtual/perl-Encode
+ virtual/perl-Getopt-Long
+ virtual/perl-File-Path
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ virtual/perl-IO-Compress
+ virtual/perl-libnet
+ virtual/perl-Storable
+ virtual/perl-Time-Piece
+
+ cddb? ( dev-perl/Net-FreeDB )
+ gnome? ( dev-perl/gnome2-vfs-perl )
+ mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
+ spell? ( dev-perl/gtk2-spell )
+ stats? ( dev-perl/Date-Calc
+ dev-perl/GD[png,truetype] )
+ tellico? ( virtual/perl-Digest-MD5
+ virtual/perl-MIME-Base64 )
+ vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.0-man.patch"
+)
+
+src_install() {
+ # Yes, ED *is* needed here. GCstar's install lacks any concept of DESTDIR.
+ ./install --prefix="${ED}usr" \
+ --noclean --nomenu || die "install script failed"
+
+ domenu share/applications/gcstar.desktop
+ for size in 16 22 24 32 36 48 64 72 96 128 256
+ do
+ newicon -s "${size}" share/gcstar/icons/gcstar_${size}x${size}.png gcstar.png
+ done
+ newicon -s scalable share/gcstar/icons/gcstar_scalable.svg gcstar.svg
+ insinto /usr/share/mime/packages
+ doins share/applications/gcstar.xml
+
+ dodoc CHANGELOG README README.fr
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mime_database_update
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/gcstar/metadata.xml b/app-misc/gcstar/metadata.xml
new file mode 100644
index 000000000000..282c4fff288e
--- /dev/null
+++ b/app-misc/gcstar/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tetromino@gentoo.org</email>
+ <name>Alexandre Rostovtsev</name>
+ </maintainer>
+ <longdescription lang="en">
+ GCstar is an application for managing your collections. It supports many
+ types of collections, including movies, books, games, comics, stamps,
+ coins, and many more. You can even create your own collection type for
+ whatever unique thing it is that you collect! Detailed information on
+ each item can be automatically retrieved from the internet and you can
+ store additional data, such as the location or who you've lent it to.
+ You may also search and filter your collections by many criteria.
+ </longdescription>
+ <use>
+ <flag name="stats">Enable statistics reporting</flag>
+ <flag name="tellico">Enable support for <pkg>kde-misc/tellico</pkg>
+ files</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/geekcode-1.7.3-r1 b/app-misc/geekcode-1.7.3-r1
deleted file mode 100644
index 5bd317188e02..000000000000
--- a/app-misc/geekcode-1.7.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Geek code generator
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/geekcode
-KEYWORDS=alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/geekcode/geekcode-1.7.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6cb380e87736e124e34e2a4a605c39af
diff --git a/app-misc/geekcode/Manifest b/app-misc/geekcode/Manifest
new file mode 100644
index 000000000000..6e8b1856afaf
--- /dev/null
+++ b/app-misc/geekcode/Manifest
@@ -0,0 +1,4 @@
+AUX geekcode-1.7.3-exit.patch 276 BLAKE2B bd008224a005aa5554d4932b3d7ecaba241009deed3e633bf787d04546141f64c9e00d3617af20fb9a84b3f304bb2b037c860528919faaf6e7a0a979e5999378 SHA512 eb8161f72166c6c03c9b6a6355a3bc6fda6aa415a3cb7e9b7d8643de9b7a414249a42d5816e191e739a433b6633b146b5058ef43ca959775b8dacf8ed9cb44bc
+DIST geekcode-1.7.3.tar.gz 60617 BLAKE2B 9e848d45054805e21489e59c6e31ba4aa41a557bf9f89754a3423724bbc449415b3033de0383b9e035af6409abfb24c36b5fcb5a25ad90a14602f7d2164b59af SHA512 eca8489dafee507246538bbb8d35cc17c5712571603bad1f470803883cdbaf9658769df77e214704b6a5adec382f76e599a2f6c48ec3759861159ac626131bfa
+EBUILD geekcode-1.7.3-r1.ebuild 701 BLAKE2B 8e93db5f0e3f0720657680bd946300b97f7efb035623f72b98d235eb11cc43f27111c22060d8e9746665d2c77457c38200602b4661f55ca531b7cfaf97ccd1d9 SHA512 80ca3aa983a600e4f2e842b7a8c79a0b4804153cdb05f931d781558414740da9a34814cfcc141d6f77a70bd9449aa6056d3d93fc2dbb328438d40af4b2642a0d
+MISC metadata.xml 325 BLAKE2B 54f0eab50c63d869f888be5d8293aa90fddb6c3bba3659903f9a3f91e5fb5214ce0bcbe08c72718fc51fcd62ae251f4b999714f2d425c9091a5700e2ca7f59bf SHA512 53919d4488a8dd446a22f6d5017d7ba41d1e510a66be9a24cf20b50a9eb047b2c771518b5bc1b2c5c58b7c34ab6465f80a40cda72594586f23f96c39bf0208f4
diff --git a/app-misc/geekcode/files/geekcode-1.7.3-exit.patch b/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
new file mode 100644
index 000000000000..23eba06a52eb
--- /dev/null
+++ b/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
@@ -0,0 +1,10 @@
+--- geekcode.h.orig 2003-06-30 16:47:40.000000000 +0200
++++ geekcode.h 2010-12-30 19:14:51.000000000 +0100
+@@ -22,6 +22,7 @@
+ #ifndef __INCLUDED_GEEKCODE_H__
+ #define __INCLUDED_GEEKCODE_H__
+
++#include <stdlib.h> /* exit() */
+
+ #define VERSION "1.7.3" /* Added in v1.2 */
+
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..72026a803e16
--- /dev/null
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Geek code generator"
+HOMEPAGE="https://sourceforge.net/projects/geekcode"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}/${P}-exit.patch"
+ sed -i Makefile -e 's| -o | ${LDFLAGS}&|g' || die "sed Makefile"
+
+ eapply_user
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin geekcode
+ dodoc CHANGES README geekcode.txt
+}
diff --git a/app-misc/geekcode/metadata.xml b/app-misc/geekcode/metadata.xml
new file mode 100644
index 000000000000..08dd382f3c44
--- /dev/null
+++ b/app-misc/geekcode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">geekcode</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/geneweb-6.08-r1 b/app-misc/geneweb-6.08-r1
deleted file mode 100644
index e33c15976337..000000000000
--- a/app-misc/geneweb-6.08-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=dev-lang/ocaml[ocamlopt?] dev-ml/camlp5[ocamlopt?] !net-p2p/ghostwhitecrab
-DESCRIPTION=Genealogy software program with a Web interface
-EAPI=6
-HOMEPAGE=http://opensource.geneanet.org/projects/geneweb
-IUSE=+ocamlopt
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/ocaml[ocamlopt?] dev-ml/camlp5[ocamlopt?]
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> geneweb-6.08.tar.gz https://dev.gentoo.org/~tupone/geneweb-6.08-ocaml-4.patch.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dca020948ad8eef6fa8e8322f01c0cae
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
new file mode 100644
index 000000000000..ea7a8027a7d1
--- /dev/null
+++ b/app-misc/geneweb/Manifest
@@ -0,0 +1,8 @@
+AUX geneweb-6.08-parallellbuild.patch 1264 BLAKE2B fa7e9a94705ce2bf439888b2e64f889a69e29b6897c46e40f4d86c3d6d56d2fc9ab2790b0514b7e52dce93c0774fe3f006d889f3ed4a02342e8694c4e8b95a7d SHA512 2912f591f0c771b9bc039871416bd74364fe4a0c17200ea191033a3d12c4de4e088ddd24829ef07acb918e0f8be91671112ae7ebe0593b96a66945b6c18ecedf
+AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da5725e20f5897db5d8f998ad275ca765fc80d19a5f387225e6b2a003e8c0af6b46dfa44c85491d495f150a9c50e5c0659 SHA512 d4e74036384123884487458a5c3ae1f35ab39b87e31239c92f800fa5e758efdb52dc4cf84686295daec78e93cf06099a1738cc1a13add659547a44352999c3b5
+AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
+AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
+DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
+DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
+EBUILD geneweb-6.08-r1.ebuild 2006 BLAKE2B 9abe41bce68df63e83ed4a83fd884c4fbc14111b23947dd9a587292be8eb73c0e76181c595fb779f4b95c516ebd2cf2817aa3dc23785629b1a91c41a51a492b8 SHA512 aa886149ccc0440009ee3918bdb7d460013284cea22b49892a32923ca6f163ed8b1c3514247e92d6adfd4247a8b92858e37d552ff8e02054feda81997e8da5b1
+MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
new file mode 100644
index 000000000000..71cfab667fc1
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
@@ -0,0 +1,31 @@
+--- geneweb-6.08/wserver/Makefile.old 2017-01-09 21:15:00.328750224 +0100
++++ geneweb-6.08/wserver/Makefile 2017-01-09 21:15:16.825751748 +0100
+@@ -11,6 +11,8 @@
+ camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
+ ocamlc -c -I "`camlp5 -where`" -impl pa_macro5.ppo
+
++wserver.cmi: pa_macro5.cmo
++
+ depend:
+ TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend
+
+--- geneweb-6.08/src/.depend.old 2017-01-09 21:36:25.644868941 +0100
++++ geneweb-6.08/src/.depend 2017-01-09 21:37:04.994872576 +0100
+@@ -39,7 +39,7 @@
+ check_base.cmx: check.cmx def.cmi gwdb.cmx secure.cmx
+ compilation.cmo: def.cmi util.cmi
+ compilation.cmx: def.cmi util.cmx
+-config.cmi: def.cmi
++config.cmi: def.cmi gwdb.cmi
+ consang.cmo: adef.cmi def.cmi gwdb.cmi consang.cmi
+ consang.cmx: adef.cmx def.cmi gwdb.cmx consang.cmi
+ consang.cmi: def.cmi gwdb.cmi
+@@ -311,7 +311,7 @@
+ num.cmi perso.cmi ../wserver/wserver.cmi
+ searchName.cmx: adef.cmx buff.cmx checkItem.cmx config.cmi date.cmx def.cmi \
+ gutil.cmx gwdb.cmx hutil.cmx mutil.cmx name.cmx util.cmx \
+- num.cmx perso.cmx ../wserver/wserver.cmx
++ num.cmx perso.cmx ../wserver/wserver.cmx some.cmo
+ secure.cmo: secure.cmi
+ secure.cmx: secure.cmi
+ select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi
diff --git a/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
new file mode 100644
index 000000000000..e5a43be720ee
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
@@ -0,0 +1,30 @@
+--- geneweb-6.08/setup/setup.ml.old 2007-08-07 19:25:13.000000000 +0200
++++ geneweb-6.08/setup/setup.ml 2007-08-07 19:24:59.000000000 +0200
+@@ -5,8 +5,8 @@
+
+ value port = ref 2316;
+ value default_lang = ref "en";
+-value setup_dir = ref ".";
+-value bin_dir = ref "";
++value setup_dir = ref "/usr/share/geneweb";
++value bin_dir = ref "/usr/bin";
+ value lang_param = ref "";
+ value only_file = ref "";
+
+--- geneweb-6.08/tools/Makefile.inc.unix.old 2017-03-06 08:15:45.334667626 +0100
++++ geneweb-6.08/tools/Makefile.inc.unix 2017-03-06 08:16:10.162223399 +0100
+@@ -6,11 +6,11 @@
+ CAMLP5F=-DUNIX
+ CAMLP5D=+camlp5
+ LIBUNIX=-cclib -lunix
+-OCAMLC=ocamlc.opt -w -3 -warn-error +a-52
+-OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52
++OCAMLC=ocamlc.opt -w -3
++OCAMLOPT=ocamlopt.opt -w -3
+ OCAMLI=
+ OCAMLD=
+-STRIP=strip
++STRIP=true
+ RM=/bin/rm -f
+ EXE=
+ STATIC=-ccopt -static
diff --git a/app-misc/geneweb/files/geneweb.confd b/app-misc/geneweb/files/geneweb.confd
new file mode 100644
index 000000000000..3a93f09d8f19
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb.confd
@@ -0,0 +1,6 @@
+#
+# GeneWeb Configuration Data
+#
+
+# The default language
+LANG="it"
diff --git a/app-misc/geneweb/files/geneweb.initd b/app-misc/geneweb/files/geneweb.initd
new file mode 100644
index 000000000000..bd0649193bdb
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting geneweb server"
+ start-stop-daemon -S -u geneweb -x /usr/bin/gwd -- -bd /var/lib/geneweb -lang $LANG -log /var/log/geneweb.log -daemon
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping geneweb server"
+ start-stop-daemon -K -u geneweb -x /usr/bin/gwd
+ eend $?
+}
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
new file mode 100644
index 000000000000..44512b0fcb92
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="http://opensource.geneanet.org/projects/geneweb"
+SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+ocamlopt"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+ dev-ml/camlp5[ocamlopt?]"
+DEPEND="${RDEPEND}
+ !net-p2p/ghostwhitecrab"
+
+PATCHES=(
+ "${WORKDIR}"/${P}-ocaml-4.patch
+ "${FILESDIR}"/${PF}-gentoo.patch
+ "${FILESDIR}"/${P}-parallellbuild.patch )
+
+src_compile() {
+ if use ocamlopt; then
+ emake
+ else
+ emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
+ # If using bytecode we dont want to strip the binary as it would remove
+ # the bytecode and only leave ocamlrun...
+ fi
+}
+
+src_install() {
+ dodoc ICHANGES
+ emake new_distrib
+ emake wrappers
+ # Install doc
+ cd distribution
+ dodoc CHANGES.txt
+ # Install binaries
+ cd gw
+ dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
+ insinto /usr/lib/${PN}
+ doins -r gwtp_tmp/*
+ dodoc a.gwf
+ insinto /usr/share/${PN}
+ doins -r etc images lang setup gwd.arg only.txt
+
+ cd ../..
+
+ # Install binaries
+ dobin src/check_base
+ # Install manpages
+ doman man/*
+
+ # Install doc
+ insinto /usr/share/doc/${PF}/contrib
+ doins -r contrib/{gwdiff,misc}
+
+ newinitd "${FILESDIR}/geneweb.initd" geneweb
+ newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+ enewuser geneweb "" "/bin/bash" /var/lib/geneweb
+ einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
+ einfo "instructions on the README in that directory to use it"
+ einfo "For 64 bits architecture you need to rebuild the database"
+ einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
+ einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
+ einfo "(using the current package)"
+}
diff --git a/app-misc/geneweb/metadata.xml b/app-misc/geneweb/metadata.xml
new file mode 100644
index 000000000000..4d7f59b58f9c
--- /dev/null
+++ b/app-misc/geneweb/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+GeneWeb is a genealogy software program with a Web interface. It can be used
+off-line or in a Web environment. It uses very efficient techniques of
+relationship and consanguinity computing, developed in collaboration with Didier
+Rémy, research Director at INRIA.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">geneweb/geneweb</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gentoo-0.20.7 b/app-misc/gentoo-0.20.7
deleted file mode 100644
index 91605f707da4..000000000000
--- a/app-misc/gentoo-0.20.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>x11-libs/gtk+-3.12:3 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Graphical file manager for Unix-like systems, using GTK+
-EAPI=6
-HOMEPAGE=http://gentoo.sourceforge.net/
-IUSE=nls
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>x11-libs/gtk+-3.12:3 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.7.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44576d6b9698bd1cd65d25c53cb1642f
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
new file mode 100644
index 000000000000..87e45180a8c2
--- /dev/null
+++ b/app-misc/gentoo/Manifest
@@ -0,0 +1,3 @@
+DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
+EBUILD gentoo-0.20.7.ebuild 1281 BLAKE2B 2276e3e4126dfd2014720a4e1507927914b7a6f4e484bbdce504ee6e3807958027c5aef9dc491870b45f8c83e12c8812cb3c9d0542d824022104b1ca1ef6bff1 SHA512 1c8844d88850a7a47e080b64fd58de787396500dd5549d67c383dc1a29d15f553e06bf37eab56ba9323459e01e10cbedd2f5c2137185833a3617a337d538d8b7
+MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
new file mode 100644
index 000000000000..f84fcd4a62e7
--- /dev/null
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Graphical file manager for Unix-like systems, using GTK+"
+HOMEPAGE="http://gentoo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND="
+ >x11-libs/gtk+-3.12:3
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/pango
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=(
+ AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
+)
+
+src_prepare() {
+ sed -i \
+ -e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
+ gentoorc.in || die
+ sed -i \
+ -e '/GTK_DISABLE_DEPRECATED/d' \
+ -e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
+ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+ configure.ac || die #357343
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --sysconfdir=/etc/gentoo \
+ $(use_enable nls)
+}
+
+src_install() {
+ default
+
+ docinto html
+ dodoc -r docs/{images,config,*.{html,css}}
+
+ newman docs/gentoo.1x gentoo.1
+
+ docinto scratch
+ dodoc docs/scratch/*
+
+ make_desktop_entry ${PN} Gentoo \
+ /usr/share/${PN}/icons/${PN}.png \
+ "System;FileTools;FileManager"
+}
diff --git a/app-misc/gentoo/metadata.xml b/app-misc/gentoo/metadata.xml
new file mode 100644
index 000000000000..663d8782116a
--- /dev/null
+++ b/app-misc/gentoo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gentoo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/geoclue-0.12.99 b/app-misc/geoclue-0.12.99
deleted file mode 100644
index b4a4d87845fe..000000000000
--- a/app-misc/geoclue-0.12.99
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2 dev-libs/libxml2 sys-apps/dbus gps? ( sci-geosciences/gpsd ) gtk? ( x11-libs/gtk+:2 ) networkmanager? ( net-misc/networkmanager ) skyhook? ( net-libs/libsoup ) dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A geoinformation D-Bus service
-EAPI=4
-HOMEPAGE=https://freedesktop.org/wiki/Software/GeoClue
-IUSE=connman geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook static-libs yahoo-geo
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2 dev-libs/libxml2 sys-apps/dbus gps? ( sci-geosciences/gpsd ) gtk? ( x11-libs/gtk+:2 ) networkmanager? ( net-misc/networkmanager ) skyhook? ( net-libs/libsoup )
-REQUIRED_USE=skyhook? ( networkmanager )
-SLOT=0
-SRC_URI=https://freedesktop.org/~hadess/geoclue-0.12.99.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dbcfb10e1445bc88a5f0c14d76f58d5a
diff --git a/app-misc/geoclue-2.4.8 b/app-misc/geoclue-2.4.8
deleted file mode 100644
index c2a725629cd7..000000000000
--- a/app-misc/geoclue-2.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !<sci-geosciences/geocode-glib-3.10.0 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=A geoinformation D-Bus service
-EAPI=6
-HOMEPAGE=https://freedesktop.org/wiki/Software/GeoClue
-IUSE=+introspection +modemmanager zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !<sci-geosciences/geocode-glib-3.10.0
-SLOT=2.0
-SRC_URI=https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.8.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b61b5a2d0d4e214496bb1c2b2f810935
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
new file mode 100644
index 000000000000..9d46166b4bb9
--- /dev/null
+++ b/app-misc/geoclue/Manifest
@@ -0,0 +1,9 @@
+AUX geoclue-0.12.0_p20110307-use-fallback-mac.patch 511 BLAKE2B eae5d5fce3b87d6d34141f0438676d862816443d0d808fe1a1e28cbc7535c59fcc54f414890107fcb5896e1e566e746dd0f03a6f478502862d45abd2aed6c2c1 SHA512 e2845272cca268c4658c3e836efd7b49bc53e7690125bc48a7d1d9d0b82b46ea88fff427ee73fa2045c74c2dfe21d45497341032363713a6401a735110bcd1e0
+AUX geoclue-0.12.0_p20110307-use-flag.patch 2571 BLAKE2B 17c6d6009bc8bc089c2fa882f5e270186f32990cc804d7172f719ec50fad97331d72d88f93c6b829b54bf106fa0ff58fb008c6ad7c2ee7f6d1433488c4cf7c47 SHA512 9558635f1c520f26c30edcd2512934a6f3238c0fabf88e2e5b345aa8521575faad2e734d84e99071b827cc81724fab27299f2b838a48993e3110d2fa6ba82eef
+AUX geoclue-0.12.99-gpsd.patch 2073 BLAKE2B 499774d91864ada9ef29a2154e17bed7e143f0e13fb30a6e9d8231f6f6e7fac9b35f99b042aa05aade1ad139dd9d393951b16dee10c3bb104aa325fa418cf24c SHA512 9a5280af319cea99567fbbaf8174f11de71f9dbbeb146c4ad42a19df1d84f7573c9cd72560b7185065e5b8507770f77fa3cc06b3e45e0a56fdf3d3e5b717f0bc
+AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
+DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
+DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
+EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
+EBUILD geoclue-2.4.8.ebuild 1577 BLAKE2B 2a1c4e4dbc825798a172a90cc1ed1ecea0b92b130bf03587a3b24564cb514df2289516420d9924def46322041849ef7fc1e6a28f7df3813cf88d7550d9b5f873 SHA512 3ac7765ba17df00d3864eb0c8fab5d21c43a9974d85e238789c461a7f267a2e65757d5469c59cb3f593aaacc6ab4907c92e60d63765e4b73237832d09d990658
+MISC metadata.xml 1062 BLAKE2B 11f3d019f7c014387f5b3faece7dd7f165e106dd27132cf56bf59b35be2fe2ac0dd02751eb87e4e8bfa77fdecf076217eb76e6e5b37acb33c26d2f26cf1ca942 SHA512 3747063a944f72bed17f4948a0c8041746cf61fe85f2b4886cf6b8f88c01dd4cbab37a94447c3a900416bf1a374d88deb812f89789e74f4465654b26fe18899d
diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch
new file mode 100644
index 000000000000..9c9115a284ef
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch
@@ -0,0 +1,16 @@
+Force geoclue to use the "fallback" mac address fetching code.
+The NM-based code does not seem to work.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- src/connectivity.c
++++ src/connectivity.c
+@@ -218,7 +218,7 @@
+ geoclue_connectivity_get_router_mac (GeoclueConnectivity *self)
+ {
+ if (self == NULL ||
+- GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL) {
++ GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL || 1) {
+ char *mac = NULL;
+ guint i;
+ int ret_val;
diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch
new file mode 100644
index 000000000000..236c98928ba7
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch
@@ -0,0 +1,79 @@
+Add configure options for all providers except localnet.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -158,7 +158,71 @@
+ AC_SUBST(CONNECTIVITY_LIBS)
+ AC_SUBST(CONNECTIVITY_CFLAGS)
+
+-PROVIDER_SUBDIRS="example hostip geonames nominatim manual plazes localnet yahoo gsmloc"
++PROVIDER_SUBDIRS="localnet"
++
++AC_ARG_ENABLE(hostip,
++ AS_HELP_STRING([--enable-hostip=@<:@no/yes/auto@:>@],
++ [build with hostip support]), ,
++ enable_hostip=auto)
++
++if test "x$enable_hostip" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS hostip"
++fi
++
++AC_ARG_ENABLE(geonames,
++ AS_HELP_STRING([--enable-geonames=@<:@no/yes/auto@:>@],
++ [build with geonames support]), ,
++ enable_geonames=auto)
++
++if test "x$enable_geonames" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS geonames"
++fi
++
++AC_ARG_ENABLE(nominatim,
++ AS_HELP_STRING([--enable-nominatim=@<:@no/yes/auto@:>@],
++ [build with nominatim support]), ,
++ enable_nominatim=auto)
++
++if test "x$enable_nominatim" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS nominatim"
++fi
++
++AC_ARG_ENABLE(manual,
++ AS_HELP_STRING([--enable-manual=@<:@no/yes/auto@:>@],
++ [build with manual support]), ,
++ enable_manual=auto)
++
++if test "x$enable_manual" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS manual"
++fi
++
++AC_ARG_ENABLE(plazes,
++ AS_HELP_STRING([--enable-plazes=@<:@no/yes/auto@:>@],
++ [build with plazes support]), ,
++ enable_plazes=auto)
++
++if test "x$enable_plazes" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS plazes"
++fi
++
++AC_ARG_ENABLE(yahoo,
++ AS_HELP_STRING([--enable-yahoo=@<:@no/yes/auto@:>@],
++ [build with yahoo support]), ,
++ enable_yahoo=auto)
++
++if test "x$enable_yahoo" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS yahoo"
++fi
++
++AC_ARG_ENABLE(gsmloc,
++ AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@],
++ [build with gsmloc support]), ,
++ enable_gsmloc=auto)
++
++if test "x$enable_gsmloc" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
++fi
++
+
+ # -----------------------------------------------------------
+ # gypsy / gpsd / skyhook
diff --git a/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch b/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch
new file mode 100644
index 000000000000..51160d6296e0
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch
@@ -0,0 +1,73 @@
+Description: Refactoring to support new libgps API
+Author: James Page <james.page@ubuntu.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40996
+Forwarded: no
+
+--- providers/gpsd/geoclue-gpsd.c
++++ providers/gpsd/geoclue-gpsd.c
+@@ -40,7 +40,12 @@
+ #include <geoclue/gc-iface-position.h>
+ #include <geoclue/gc-iface-velocity.h>
+
++#if GPSD_API_MAJOR_VERSION >= 5
++/* gps_data conflicts with gps_data function */
++typedef struct gps_data_t gps_data_l;
++#else
+ typedef struct gps_data_t gps_data;
++#endif
+ typedef struct gps_fix_t gps_fix;
+
+ /* only listing used tags */
+@@ -59,7 +64,11 @@
+ char *host;
+ char *port;
+
++#if GPSD_API_MAJOR_VERSION >= 5
++ gps_data_l *gpsdata;
++#else
+ gps_data *gpsdata;
++#endif
+
+ gps_fix *last_fix;
+
+@@ -394,10 +403,16 @@
+ static gboolean
+ geoclue_gpsd_start_gpsd (GeoclueGpsd *self)
+ {
++#if GPSD_API_MAJOR_VERSION >= 5
++ int status = gps_open (self->host, self->port, self->gpsdata);
++ if (status == 0) {
++ gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA, NULL);
++#else
+ self->gpsdata = gps_open (self->host, self->port);
+ if (self->gpsdata) {
+ gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA | POLL_NONBLOCK, NULL);
+ gps_set_raw_hook (self->gpsdata, gpsd_raw_hook);
++#endif
+ return TRUE;
+ } else {
+ g_warning ("gps_open() failed, is gpsd running (host=%s,port=%s)?", self->host, self->port);
+@@ -410,10 +425,23 @@
+ {
+ GeoclueGpsd *self = (GeoclueGpsd*)data;
+ if (self->gpsdata) {
++#if GPSD_API_MAJOR_VERSION >= 5
++ /* gps_poll and gps_set_raw_hook no longer present in this API version */
++ if (gps_waiting(self->gpsdata, 500)) {
++ if (gps_read(self->gpsdata) == -1) {
++ geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
++ geoclue_gpsd_stop_gpsd(self);
++ return FALSE;
++ } else {
++ /* Call existing raw_hook to process the data */
++ gpsd_raw_hook(self->gpsdata, NULL, 0);
++ }
++#else
+ if (gps_poll(self->gpsdata) < 0) {
+ geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
+ geoclue_gpsd_stop_gpsd(self);
+ return FALSE;
++#endif
+ }
+ }
+ return TRUE;
diff --git a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
new file mode 100644
index 000000000000..b27bf5d44c01
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
@@ -0,0 +1,44 @@
+This has been edited to fit geoclue that import the code from geocode-glib.
+--Anthony G. Basile
+
+From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Tue, 22 Mar 2016 09:48:00 +0000
+Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features
+
+Commit f0f85d8d introduces __GLIBC__ to check for glibc only features.
+However this is not sufficient for uClibc because it shares code with
+glibc. To select for features in glibc but not uClibc, we need
+defined(__GLIBC__) && !defined(__UCLIBC__).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764021
+---
+ geocode-glib/geocode-glib.c | 4 ++--
+ geocode-glib/test-gcglib.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/geocode-glib/geocode-glib.c b/src/geocode-glib/geocode-glib.c
+index 4e3b3fd..6215fd1 100644
+--- a/src/geocode-glib/geocode-glib.c
++++ b/src/geocode-glib/geocode-glib.c
+@@ -213,7 +213,7 @@ _geocode_object_get_lang (void)
+ return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL));
+ }
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ static gpointer
+ is_number_after_street (gpointer data)
+ {
+@@ -246,7 +246,7 @@ is_number_after_street (gpointer data)
+ gboolean
+ _geocode_object_is_number_after_street (void)
+ {
+-#ifndef __GLIBC__
++#if !defined(__GLIBC__) || defined(__UCLIBC__)
+ return FALSE;
+ #else
+ static GOnce once = G_ONCE_INIT;
+--
+2.7.3
+
diff --git a/app-misc/geoclue/geoclue-0.12.99.ebuild b/app-misc/geoclue/geoclue-0.12.99.ebuild
new file mode 100644
index 000000000000..2e7e56b9b28f
--- /dev/null
+++ b/app-misc/geoclue/geoclue-0.12.99.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="https://freedesktop.org/~hadess/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+IUSE="connman geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook static-libs yahoo-geo"
+
+REQUIRED_USE="skyhook? ( networkmanager )"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2
+ dev-libs/libxml2
+ sys-apps/dbus
+ gps? ( sci-geosciences/gpsd )
+ gtk? ( x11-libs/gtk+:2 )
+ networkmanager? ( net-misc/networkmanager )
+ skyhook? ( net-libs/libsoup )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-0.12.0_p20110307-use-flag.patch \
+ "${FILESDIR}"/${PN}-0.12.0_p20110307-use-fallback-mac.patch \
+ "${FILESDIR}"/${P}-gpsd.patch
+
+ sed -i -e '/CFLAGS/s:-g ::' configure.ac || die #399177
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # Conic is only for Maemo. Don't enable.
+ # Gypsy has multiple vulnerabilities:
+ # https://bugs.freedesktop.org/show_bug.cgi?id=33431
+ econf \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ --disable-schemas-compile \
+ $(use_enable gtk tests) \
+ $(use_enable gtk) \
+ --disable-conic \
+ $(use_enable connman) \
+ $(use_enable networkmanager) \
+ --disable-gypsy \
+ $(use_enable gps gpsd) \
+ $(use_enable skyhook) \
+ $(use_enable geonames) \
+ $(use_enable gsmloc) \
+ $(use_enable hostip) \
+ $(use_enable manual) \
+ $(use_enable nominatim) \
+ $(use_enable plazes) \
+ $(use_enable yahoo-geo yahoo) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use gtk && dobin test/.libs/geoclue-test-gui
+ prune_libtool_files
+}
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
new file mode 100644
index 000000000000..ba3294f255e4
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+IUSE="+introspection +modemmanager zeroconf"
+
+RDEPEND="
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/json-glib-0.14
+ >=net-libs/libsoup-2.42:2.4
+ sys-apps/dbus
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+ modemmanager? ( >=net-misc/modemmanager-1.6 )
+ zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
+ !<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # debug only affects CFLAGS
+ gnome2_src_configure \
+ --enable-backend \
+ --with-dbus-service-user=geoclue \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(use_enable introspection) \
+ $(use_enable modemmanager 3g-source) \
+ $(use_enable modemmanager cdma-source) \
+ $(use_enable modemmanager modem-gps-source) \
+ $(use_enable zeroconf nmea-source)
+}
+
+pkg_preinst() {
+ enewgroup geoclue
+ enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+ gnome2_pkg_preinst
+}
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
new file mode 100644
index 000000000000..bd2c408ce28f
--- /dev/null
+++ b/app-misc/geoclue/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+ <flag name="geonames">Install geonames.org provider</flag>
+ <flag name="gsmloc">Install GSM location provider</flag>
+ <flag name="gtk">Install gtk-based geoclue-test-gui</flag>
+ <flag name="hostip">Install hostip.info provder</flag>
+ <flag name="manual">Install manual provider</flag>
+ <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
+ <flag name="nominatim">Install openstreetmap.org provider</flag>
+ <flag name="plazes">Install plazes.com provider</flag>
+ <flag name="skyhook">Install skyhookwireless.com provider</flag>
+ <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
+ <flag name="zeroconf">Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/getopt-1.1.6 b/app-misc/getopt-1.1.6
deleted file mode 100644
index 8bda0fc2bac7..000000000000
--- a/app-misc/getopt-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=getopt(1) replacement supporting GNU-style long options
-EAPI=4
-HOMEPAGE=http://software.frodo.looijaard.name/getopt/
-IUSE=nls
-KEYWORDS=~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=425ee8aba8425afe2eeaceb4d935f976
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
new file mode 100644
index 000000000000..f15246ae52d1
--- /dev/null
+++ b/app-misc/getopt/Manifest
@@ -0,0 +1,7 @@
+AUX getopt-1.1.4-irix.patch 357 BLAKE2B 12ec0e7a6dc156967731d8a09bae4fc91f6dfda55a3ffd549d3fa1292ff7fb6d8106aff44428adbba0bdf0e05c976b063c0f91848e8a9938d4c8cebd05d4b545 SHA512 001949835eafe86d5f1f9dfef9892ebbf6b1c5a3d870cf57c4ac7543c048c061429c8f7cb754260ff16e2694bb497ed89c0d4e746f1c7064883a55940563dd92
+AUX getopt-1.1.5-libintl.patch 353 BLAKE2B fa5f6c7eac124d16344b52227ab704656cc448c86ae871f67adb1d871000d74536d9c434285d046ec3667c53f3442b16db10da88a9ddabdb14e6a3b17a8b2046 SHA512 eca001588a940f5bc50f95c0f93fc352f5dc647325a5b1ff0c7ddf0bf93e2c8fd2ac4f735c0ae5d48e4c9b2c54799e6d6028a5602147a3b9a28dc5e65e66f5ec
+AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
+AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
+DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
+EBUILD getopt-1.1.6.ebuild 1805 BLAKE2B fb17973221578d2a6f596402458c4b284d85fb44c2bb5d3a15af93eb01d665dfbba6ec52f991ebfe73e3b5aeb8b4ad5965606a6ecc3bb8bf0dd562a2244bf054 SHA512 bbabb00afadc32048bb079dddf714392e98dad887cb3d0fa50d53d4bf4eb49848624fef44df390b9b950b3fe74a199aae2f23e21fd8b270d91d872542cb244c3
+MISC metadata.xml 342 BLAKE2B 799fd88b4f38206d301039f579ea9b29920c98946ad0c5fdc57d2ae32d280843c5dfbd4db50d3f4cf7aee7f287d79361878d366ecc8b415406182639a3cffca0 SHA512 90fdb073ca1dcd23506cb421440ec9719517f4bbb6839f5944898a3368bd01aba189346c26a27928a777ef59b22256ea5046ed9180b5b2ff034afbc7b4374b05
diff --git a/app-misc/getopt/files/getopt-1.1.4-irix.patch b/app-misc/getopt/files/getopt-1.1.4-irix.patch
new file mode 100644
index 000000000000..0c344a80131a
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.4-irix.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/show_bug.cgi?id=211499
+
+--- gnu/getopt.c.dist
++++ gnu/getopt.c
+@@ -69,12 +69,7 @@
+ #include <unistd.h>
+ #endif /* GNU C library. */
+
+-#ifdef VMS
+-#include <unixlib.h>
+-#if HAVE_STRING_H - 0
+ #include <string.h>
+-#endif
+-#endif
+
+ #if defined (WIN32) && !defined (__CYGWIN32__)
+ /* It's not Unix, really. See? Capital letters. */
diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
new file mode 100644
index 000000000000..b40367105ed0
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2012-12-28 11:40:09.524686698 +0100
++++ Makefile 2012-12-28 11:41:20.646157275 +0100
+@@ -61,7 +61,7 @@
+ -$(RM) $(objects) $(binaries)
+
+ getopt: $(objects)
+- $(CC) $(LDFLAGS) -o $@ $(objects)
++ $(CC) $(LDFLAGS) -o $@ $(objects) $(LIBINTL)
+
+ install: getopt install_po
+ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
diff --git a/app-misc/getopt/files/getopt-1.1.5-setlocale.patch b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch
new file mode 100644
index 000000000000..2d302d9c6a67
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch
@@ -0,0 +1,12 @@
+setlocale: we need locale.h for LC_ALL on OpenIndiana
+
+--- getopt-1.1.5/nls.h
++++ getopt-1.1.5/nls.h
+@@ -40,6 +40,7 @@
+ #undef setlocale
+ #define setlocale(Category,Locale) /* empty */
+ #else /* not WITHOUT_GETTEXT */
++#include <locale.h>
+ #include <libintl.h>
+ #define _(Text) gettext (Text)
+ #endif /* WITHOUT_GETTEXT */
diff --git a/app-misc/getopt/files/getopt-1.1.6-longrename.patch b/app-misc/getopt/files/getopt-1.1.6-longrename.patch
new file mode 100644
index 000000000000..f2b4ba79a090
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.6-longrename.patch
@@ -0,0 +1,70 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,7 @@ MSGFMT=msgfmt
+ LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
+ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+
+-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\" -Dprogram_version=\"$(VERSION)\"
++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)-long\" -Dprogram_version=\"$(VERSION)\"
+ ifeq ($(LIBCGETOPT),0)
+ CPPFLAGS+=-I./gnu
+ endif
+@@ -81,7 +81,7 @@ install_po: all_po
+ for lang in $(LANGUAGES) ; do \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(INSTALL) -m 755 -d $(DESTDIR)$$dir ;\
+- $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt.mo ;\
++ $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt-long.mo ;\
+ done
+ clean_po:
+ $(RM) $(MOFILES)
+--- a/getopt-parse.bash
++++ b/getopt-parse.bash
+@@ -19,7 +19,7 @@
+ # Note that we use `"$@"' to let each command-line parameter expand to a
+ # separate word. The quotes around `$@' are essential!
+ # We need TEMP as the `eval set --' would nuke the return value of getopt.
+-TEMP=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \
++TEMP=`getopt-long -o ab:c:: --long a-long,b-long:,c-long:: \
+ -n 'example.bash' -- "$@"`
+
+ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+--- a/getopt-parse.tcsh
++++ b/getopt-parse.tcsh
+@@ -26,7 +26,7 @@
+ # as a list. The ':q` copies that list without doing any substitutions:
+ # each element of argv becomes a separate argument for getopt. The braces
+ # are needed because the result is also a list.
+-set temp=(`getopt -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
++set temp=(`getopt-long -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
+ if ($? != 0) then
+ echo "Terminating..." >/dev/stderr
+ exit 1
+--- a/getopt.c
++++ b/getopt.c
+@@ -344,12 +344,12 @@ static void __attribute__ ((__noreturn__)) print_help(void)
+ fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr);
+ fputs(_(" -Q, --quiet-output No normal output\n"), stderr);
+ fputs(_(" -s, --shell <shell> Set shell quoting conventions\n"), stderr);
+- fputs(_(" -T, --test Test for getopt(1) version\n"), stderr);
++ fputs(_(" -T, --test Test for getopt-long(1) version\n"), stderr);
+ fputs(_(" -u, --unquoted Do not quote the output\n"), stderr);
+ fputs(USAGE_SEPARATOR, stderr);
+ fputs(USAGE_HELP, stderr);
+ fputs(USAGE_VERSION, stderr);
+- fprintf(stderr, USAGE_MAN_TAIL("getopt(1)"));
++ fprintf(stderr, USAGE_MAN_TAIL("getopt-long(1)"));
+ exit(PARAMETER_EXIT_CODE);
+ }
+
+--- a/nls.h
++++ b/nls.h
+@@ -29,7 +29,7 @@
+ #ifndef GETOPT_NLS
+ #define GETOPT_NLS
+
+-#define PACKAGE "getopt"
++#define PACKAGE "getopt-long"
+
+ #if WITHOUT_GETTEXT
+ #define _(Text) (Text)
diff --git a/app-misc/getopt/getopt-1.1.6.ebuild b/app-misc/getopt/getopt-1.1.6.ebuild
new file mode 100644
index 000000000000..b81506dc50a1
--- /dev/null
+++ b/app-misc/getopt/getopt-1.1.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="getopt(1) replacement supporting GNU-style long options"
+HOMEPAGE="http://software.frodo.looijaard.name/getopt/"
+SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.1.5-libintl.patch
+ epatch "${FILESDIR}"/${PN}-1.1.5-setlocale.patch
+ epatch "${FILESDIR}"/${PN}-1.1.6-longrename.patch
+
+ # hopefully this is portable enough
+ epatch "${FILESDIR}"/${PN}-1.1.4-irix.patch
+}
+
+src_compile() {
+ local nogettext="1"
+ local libintl=""
+ local libcgetopt=1
+
+ if use nls; then
+ nogettext=0
+ has_version sys-libs/glibc || libintl="-lintl"
+ fi
+
+ [[ ${CHOST} == *-aix* ]] && libcgetopt=0
+ [[ ${CHOST} == *-irix* ]] && libcgetopt=0
+ [[ ${CHOST} == *-interix* ]] && libcgetopt=0
+
+ emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
+ LIBCGETOPT=${libcgetopt} \
+ WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+ use nls && emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install_po
+
+ newbin getopt getopt-long
+
+ # at least on interix, the system getopt is ... broken...
+ # util-linux, which would provide the getopt binary, does not build &
+ # install on interix/prefix, so, this has to provide it.
+ [[ ${CHOST} == *-interix* || ${CHOST} == *-mint* ]] && \
+ dosym getopt-long /usr/bin/getopt
+
+ newman getopt.1 getopt-long.1
+
+ dodoc getopt-*sh
+}
diff --git a/app-misc/getopt/metadata.xml b/app-misc/getopt/metadata.xml
new file mode 100644
index 000000000000..b7214d2c696f
--- /dev/null
+++ b/app-misc/getopt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
+<maintainer type="project">
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/glastree-1.04 b/app-misc/glastree-1.04
deleted file mode 100644
index 0ba2ee4c0037..000000000000
--- a/app-misc/glastree-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl dev-perl/Date-Calc
-DESCRIPTION=glastree is a poor mans snapshot utility using hardlinks written in perl
-EAPI=4
-HOMEPAGE=http://www.igmus.org/code/
-KEYWORDS=~amd64 ppc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.igmus.org/files/glastree-1.04.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac980ec67f9508001000cfd050f3bf2b
diff --git a/app-misc/glastree/Manifest b/app-misc/glastree/Manifest
new file mode 100644
index 000000000000..84ca0da76890
--- /dev/null
+++ b/app-misc/glastree/Manifest
@@ -0,0 +1,4 @@
+AUX glastree-posix-make.patch 559 BLAKE2B be055c7114bd0ddf52aed5b09ccba2110b15167019146ccddd411aba48e07f6d8091756a47034915ff7c253d166137e0e34a7fa92cb3263bff53886bd4a37aa8 SHA512 fe76f51fc869ce03b9e44270045b6b92c8d69e4fac5878eee7167899633aad1fe2d68648310f3ba6edd47360dcb93c7d0dbda2323e9c2d44adf0d984708a174d
+DIST glastree-1.04.tar.gz 5846 BLAKE2B b380b577a712f08b0a3ec89627d9f8bd20c76244ab19c8e76d27ac2fa08b0242381c280430fafe8a43bef78de8954d4660051d7648550c4ecd789a8941b55a4d SHA512 81b819bc91780f42f945db13efc97faadd661c3272007dc0b90ed998776d3fc0fbe406249f069f0065271208c9f6ccd0488021d384e05d5b9da39311bec8f94d
+EBUILD glastree-1.04.ebuild 635 BLAKE2B e4ff8181d2701c2933136ddc98f6685e2c43e8c70d8993d2d1fa2d709a441c2191a005a0a91e275c5802aa310b0359cd4d8270bf36960cdc3d44e9bd1cb8fc45 SHA512 cd9989a5c734ba1df00af5dc79a34cb7ff4c3ffc9367a9dda494dcdb6bdd31a201fc3b95b664a79014c22ac895df4fdb20daca5968b124d10e18773939853406
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/glastree/files/glastree-posix-make.patch b/app-misc/glastree/files/glastree-posix-make.patch
new file mode 100644
index 000000000000..07e4bf6ec91a
--- /dev/null
+++ b/app-misc/glastree/files/glastree-posix-make.patch
@@ -0,0 +1,16 @@
+Make sure the perl code is valid both with and without the backslashes.
+Some make versions strip them, others don't.
+
+--- glastree-1.04/Makefile
++++ glastree-1.04/Makefile
+@@ -24,8 +24,8 @@
+
+ install:
+ @perl -e 'eval "use Date::Calc"; \
+- print "Checking for prereq Date::Calc..."; \
+- if ($$@) { print "\nThis program requires the Date::Calc module.\n"; exit 1; } \
++ print "Checking for prereq Date::Calc..."; if ($$@) { \
++ print "\nThis program requires the Date::Calc module.\n"; exit 1; } \
+ print " OK\n"; '
+
+ $(INSTALL) -d $(INSTROOT)/$(INSTBIN)
diff --git a/app-misc/glastree/glastree-1.04.ebuild b/app-misc/glastree/glastree-1.04.ebuild
new file mode 100644
index 000000000000..892b11bc30aa
--- /dev/null
+++ b/app-misc/glastree/glastree-1.04.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="glastree is a poor mans snapshot utility using hardlinks written in perl"
+HOMEPAGE="http://www.igmus.org/code/"
+SRC_URI="http://www.igmus.org/files/${P}.tar.gz"
+DEPEND="dev-lang/perl
+ dev-perl/Date-Calc"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+LICENSE="public-domain"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-posix-make.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr/share/man/man1
+ emake INSTROOT="${D}"/usr INSTMAN=share/man install
+ dodoc README CHANGES THANKS TODO
+}
diff --git a/app-misc/glastree/metadata.xml b/app-misc/glastree/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/glastree/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/glcdprocdriver-0.0.6 b/app-misc/glcdprocdriver-0.0.6
deleted file mode 100644
index 5298c016f893..000000000000
--- a/app-misc/glcdprocdriver-0.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=app-misc/graphlcd-base-0.1.3 sys-libs/glibc
-DESCRIPTION=Glue library for the glcdlib LCDproc driver based on GraphLCD
-EAPI=5
-HOMEPAGE=http://www.muresan.de/graphlcd/lcdproc/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/graphlcd-base-0.1.3 sys-libs/glibc
-SLOT=0
-SRC_URI=http://www.muresan.de/graphlcd/lcdproc/glcdprocdriver-0.0.6.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ecac813d84e4b640944fb7af0d641c84
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
new file mode 100644
index 000000000000..968ae47c1299
--- /dev/null
+++ b/app-misc/glcdprocdriver/Manifest
@@ -0,0 +1,3 @@
+DIST glcdprocdriver-0.0.6.tar.bz2 17209 BLAKE2B 631918337227c43eac163d7353182852500c08db0d1d0f3d4145d9b57895a66eb8c47a16715c1c0e4c3ab044a0de5ed80c282fd57850cbb33636cf775b721a4f SHA512 c489b6e6d6a72306867adb94ed6a6cf6354c834a27fd2ab2ac733707954b18bf93dc56a868e167fcb183602c03ac648bb941699760817e414ab8e8592edb8b7e
+EBUILD glcdprocdriver-0.0.6.ebuild 745 BLAKE2B 770037eff2b660262de1969140ca7ed5f5ca6bf6f0c2ec4682a7d211839347e07c626939f05c7103d58ea9b821297ece5b2ffad90f5651c19ad7ac5833c239be SHA512 3a7a28e045eafddbfc97b935454a557ead15aed88f1b6d2f9eed50f1fc1655c28a59b9bc810257a3de5eb32086e823e5821278c60672ab80b3a6caa263c81a65
+MISC metadata.xml 483 BLAKE2B 7fdac74c2af257088f9fc1d35d975c8532474bd61a52ae00d278dbb3db52388cebee18be4b1fceb5546bd6a30f14a254f5a3ebdbf329d8eb36e35b612643eaa1 SHA512 a72df04665d70953ea5a89a13e141bd78ac9817b4129c966b59c01d55f3afb15dfb44f49f9ce394c781ac94f034ed110e489f471dd93eb06af66d489a643a485
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild
new file mode 100644
index 000000000000..81329a2f6182
--- /dev/null
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Glue library for the glcdlib LCDproc driver based on GraphLCD"
+HOMEPAGE="http://www.muresan.de/graphlcd/lcdproc/"
+SRC_URI="http://www.muresan.de/graphlcd/lcdproc/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=app-misc/graphlcd-base-0.1.3
+ sys-libs/glibc"
+RDEPEND=${DEPEND}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install()
+{
+ emake DESTDIR="${D}/usr" LIBDIR="${D}/usr/$(get_libdir)" install
+ dodoc AUTHORS README INSTALL TODO ChangeLog
+ dosym usr/$(get_libdir)/libglcdprocdriver.so{,.1}
+}
diff --git a/app-misc/glcdprocdriver/metadata.xml b/app-misc/glcdprocdriver/metadata.xml
new file mode 100644
index 000000000000..9dde3d16415a
--- /dev/null
+++ b/app-misc/glcdprocdriver/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ GLCDprocDriver is the glue between the app-misc/graphlcd-base
+ library, which is written in C++, and app-misc/lcdproc's
+ meta-driver glcdlib, which extends supported displays in LCDproc
+ by those supported through graphlcd-base (just in text mode, of
+ course).
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/glimpse-4.18.6-r1 b/app-misc/glimpse-4.18.6-r1
deleted file mode 100644
index 72039993c787..000000000000
--- a/app-misc/glimpse-4.18.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A index/query system to search a large set of files quickly
-EAPI=6
-HOMEPAGE=http://webglimpse.net/
-IUSE=static
-KEYWORDS=alpha amd64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=ISC
-RDEPEND=!dev-libs/tre !dev-ruby/amatch !app-text/agrep
-SLOT=0
-SRC_URI=http://webglimpse.net/trial/glimpse-4.18.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1811673068056e98224b04c11e3cfee1
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
new file mode 100644
index 000000000000..c0a2f380cb0f
--- /dev/null
+++ b/app-misc/glimpse/Manifest
@@ -0,0 +1,4 @@
+AUX glimpse-4.18.6-makefile.patch 1048 BLAKE2B e937f045dec826e5660ba4f38e4f6c9dd05ee4cd71b5b9044d5c9f24c22d5ad91745d526638b2daebf29dc8ae5b0fafe0c30a3f13a46193185805be7e61a730a SHA512 568b0cc6f52d8ce79e5ad552a302a814162072b85f1a3b7bd2b00bf18ae2d7526429f68f6910d9fb91ddcde43387a2778f9f61ed3f86f0fb533b69946cfef0b7
+DIST glimpse-4.18.6.tar.gz 812595 BLAKE2B 427ab2523236d9aa04ad789d001d5234483842f4d8d812a01b7cf2adc9354917da2e95df7b88917d8c0a282c7aab67bfd2cfbb87a6600a31fe6b07b6936137c9 SHA512 884daf2057f46bbe29ad2c3e9000e18a3fcc5101abdcb5193dcf66e5da650e2528a6d2cef05ab4176243f381ba03f533cba989cad329697808d97a61f1b42d3a
+EBUILD glimpse-4.18.6-r1.ebuild 1422 BLAKE2B 67d8b20dfc96a3f2b6b3130175bc91dfebc4b0cdc91f32795c4437f785671aa2f4c5a964e9d1ab2137dca24fe3aa1069c17c1542cdca8e7525080fa43e965d80 SHA512 d8fc26603642c4732b3beedc8c4747d3fce0ebffea62ac59f11c46d8d49cfaf5618d51c3b0cd5234fd0ed822bf2e3d45659f4278b3c014adc25efc01b9e74e72
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch
new file mode 100644
index 000000000000..a6f3b430d62b
--- /dev/null
+++ b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch
@@ -0,0 +1,42 @@
+--- a/Makefile.in 2006-03-10 20:42:12.000000000 -0500
++++ b/Makefile.in.new 2010-08-12 21:12:41.000000000 -0400
+@@ -52,7 +52,7 @@
+ PROGAGREP = agrep/agrep
+ OPTIMIZEFLAGS = -O2
+ INCLUDEFLAGS = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include
+-CFLAGS = $(INCLUDEFLAGS) $(DEFS)
++CFLAGS = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS)
+
+ OBJS = get_filename.o \
+ get_index.o \
+@@ -78,7 +78,7 @@
+ $(INDEXDIR)/memlook.c \
+ $(INDEXDIR)/io.c
+
+-all: build-sub @TARGET@
++all: build-sub
+ Sall: $(PROG) $(PROGSERVER) $(PROGINDEX)
+ agrep: $(PROGAGREP)
+ NOTSall: $(NOTSPROG) $(NOTSPROGSERVER)
+@@ -87,6 +87,7 @@
+ for d in $(SUBDIRS) ; do \
+ ( cd $$d; $(MAKE) ); \
+ done
++ $(MAKE) @TARGET@
+
+ # Check target
+
+@@ -105,11 +106,11 @@
+
+ install-man:
+ for d in $(MANUAL) ; do \
+- $(INSTALL_MAN) $$d $(mandir) ; \
++ $(INSTALL_MAN) $$d $(mandir)/man1/ ; \
+ done
+
+ installdirs: mkinstalldirs
+- $(srcdir)/mkinstalldirs $(bindir) $(mandir)
++ $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/
+
+ clean:
+ for d in $(SUBDIRS); do \
diff --git a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
new file mode 100644
index 000000000000..0db485045de1
--- /dev/null
+++ b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A index/query system to search a large set of files quickly"
+HOMEPAGE="http://webglimpse.net/"
+SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="static"
+
+RDEPEND="!dev-libs/tre
+ !dev-ruby/amatch
+ !app-text/agrep"
+
+PATCHES=( "${FILESDIR}/${PN}-4.18.6-makefile.patch" )
+
+src_prepare() {
+ sed -i \
+ -e "s:CC=.*:CC=$(tc-getCC):" \
+ -e 's:-O3 -fomit-frame-pointer:$(OPTIMIZEFLAGS):' \
+ dynfilters/Makefile.in \
+ || die "removing -O3 failed"
+ sed -i \
+ -e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \
+ {agrep,compress,index}/Makefile.in \
+ libtemplate/{template,util}/Makefile.in \
+ || die "inserting OPTIMIZEFLAGS failed"
+ sed -i \
+ -e 's:$(mandir):&/man1/:' \
+ agrep/Makefile.in \
+ || die "adding man1 to man install dir failed"
+
+ sed -i \
+ -e '/^LDFLAGS/d' \
+ {agrep,compress,index}/Makefile.in \
+ || die "LDFLAGS sed failed"
+
+ default
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ default
+}
+
+src_compile() {
+ # The OPTIMIZEFLAGS variable is our own, patched in...
+ emake OPTIMIZEFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ # The build system is buggy; we get sandbox violations without this.
+ emake prefix="${ED}/usr" install
+}
diff --git a/app-misc/glimpse/metadata.xml b/app-misc/glimpse/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/glimpse/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/gnote-3.24.1 b/app-misc/gnote-3.24.1
deleted file mode 100644
index 15cd9927d9d4..000000000000
--- a/app-misc/gnote-3.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35.0 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop note-taking application
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ FDL-1.1
-RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnote/3.24/gnote-3.24.1.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24f5bce254983a50aab65510496b51b8
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
new file mode 100644
index 000000000000..e7efdbb20dc9
--- /dev/null
+++ b/app-misc/gnote/Manifest
@@ -0,0 +1,3 @@
+DIST gnote-3.24.1.tar.xz 3310012 BLAKE2B b6167dbb2461e574e4f21b2f227eb9a3c89708ddd15a561146faa044130e5c9ccc6d64b4923c30726160ee35d4ab5a0ae04b1593e74af2fa6566582af9bc1f18 SHA512 759fb2984312a3e3d5aed9b79f2309021b69df57b820d34814a5d3d9b5c9201abc6e50d83bf64f30974991d779b0b85e599435a24ee1326b867a2a4be8e0f37e
+EBUILD gnote-3.24.1.ebuild 1547 BLAKE2B 8a0e15ea352c054b0d777386d798334f921e5778c462822e932a5f21f0442b7bd71738f4ebc91ada4f6eb58c60af5d4876bc0265d0d283fcbe925cc4c8ce2bd7 SHA512 6144bccd5cd942f967729912371ff82622874cde18bfda99f905322a9fa16d3e52d0d973d17d4b2da5c92d93ada3eadd19f9f90db57bdddfa2b03cbeb12aff7d
+MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.24.1.ebuild b/app-misc/gnote/gnote-3.24.1.ebuild
new file mode 100644
index 000000000000..efeb2abea8e1
--- /dev/null
+++ b/app-misc/gnote/gnote-3.24.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+# Automagic:
+# glib-2.32 dep
+# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
+COMMON_DEPEND="
+ >=app-crypt/libsecret-0.8
+ >=app-text/gtkspell-3.0:3
+ >=dev-cpp/glibmm-2.32:2
+ >=dev-cpp/gtkmm-3.18:3.0
+ >=dev-libs/glib-2.32:2[dbus]
+ >=dev-libs/libxml2-2:2
+ dev-libs/libxslt
+ >=sys-apps/util-linux-2.16:=
+ >=x11-libs/gtk+-3.20:3
+"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/intltool-0.35.0
+ dev-util/itstool
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Do not alter CFLAGS
+ sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+
+ gnome2_src_prepare
+
+ if has_version net-fs/wdfs; then
+ DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+ synchronize notes."
+ else
+ DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+ If you want to use that functionality just emerge net-fs/wdfs.
+ Gnote will automatically detect that you did and let you use it."
+ fi
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable debug)
+}
+
+src_install() {
+ gnome2_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/app-misc/gnote/metadata.xml b/app-misc/gnote/metadata.xml
new file mode 100644
index 000000000000..9c70dba0d6b9
--- /dev/null
+++ b/app-misc/gnote/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tsuna/boost.m4</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gnuit-4.9.5-r2 b/app-misc/gnuit-4.9.5-r2
deleted file mode 100644
index 9f5822fecb0e..000000000000
--- a/app-misc/gnuit-4.9.5-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=GNU Interactive Tools - increase speed and efficiency of most daily tasks
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnuit/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-3 FDL-1.3
-SLOT=0
-SRC_URI=mirror://gnu/gnuit/gnuit-4.9.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94cb00f06ee72addacb954b615aeadae
diff --git a/app-misc/gnuit/Manifest b/app-misc/gnuit/Manifest
new file mode 100644
index 000000000000..50245a0b535f
--- /dev/null
+++ b/app-misc/gnuit/Manifest
@@ -0,0 +1,4 @@
+AUX gnuit-4.9.5-format-security.patch 427 BLAKE2B 29d289419aafdcbbeec4d530f202036f0715fef4686df1564aa34302858e26856b678133ed618ae52fcb7f39bafa759173bcdae530c8c1e0a7b78614924fcbad SHA512 de604126f686af2eec160d4bd735f3888ee87a0b7bab38bb3d00d4dd26694c66810641687bb413933acb7991893a8772490fdc36fd001325d2a2b5f82bb3afc2
+DIST gnuit-4.9.5.tar.gz 894362 BLAKE2B c609ac823dc93ab4092638dbfb19e85a9d7629f41be43ac1670341151daec49486c220b96b97492b9a51e4400e8581c2d7dc58c9092cf2c09e600d852993ab75 SHA512 91f1a86f45d5a2fab91941587aed3c1e57ae68271584bef38560c9a31fabbdfeba801d87cdf5640ba9f2041e43305e49c64953b8d5370f3f6a463b2fa2a7c5da
+EBUILD gnuit-4.9.5-r2.ebuild 1123 BLAKE2B 6af7d20778ed3600870fafd8bcaede31525e1abb41f5338689e4b542ce52b63813f85d81c246e723618dabc9bcaf7a4271996e4c96fb964f2ac2a6fa7b0c08e2 SHA512 412d4c1ac55b92223b7f78fa085d42355d21dca51006c2b5ac219f184a3f28443e467c184888dc433b44294711ba8d129051567d2f3664dc11fc1462c3456fd1
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
new file mode 100644
index 000000000000..ec2a1c51fdb8
--- /dev/null
+++ b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
@@ -0,0 +1,16 @@
+ src/git.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/git.c b/src/git.c
+index c6040b2..595912d 100644
+--- a/src/git.c
++++ b/src/git.c
+@@ -1917,7 +1917,7 @@ main(argc, argv)
+ printf("%s %s (%s)\n", PRODUCT, VERSION, HOST);
+ #endif /* !HAVE_GCC */
+
+- printf(copyright);
++ printf("%s", copyright);
+
+ #ifdef DEBIAN
+ add_to_environment("GIT_EDITOR", "EDITOR", "sensible-editor");
diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
new file mode 100644
index 000000000000..3f949e51f693
--- /dev/null
+++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily tasks"
+HOMEPAGE="https://www.gnu.org/software/gnuit/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_configure() {
+ # The transition option controls whether a "git" wrapper is installed, it is
+ # disabled explicitly so we don't need to block on dev-vcs/git.
+ econf --disable-transition
+}
+
+src_install() {
+ default
+ #emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install
+ mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die
+}
+
+pkg_postinst() {
+ elog "The 'git' tool this package previously installed is now called 'gitfm'"
+ elog "The 'gitview' tool this package previously installed is now called 'gnuitview'"
+ elog "If you want the 'gitaction' tool to use your preferred desktop"
+ elog "application settings install the 'x11-misc/xdg-utils' package."
+}
diff --git a/app-misc/gnuit/metadata.xml b/app-misc/gnuit/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/gnuit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/gnutu-2.5-r1 b/app-misc/gnutu-2.5-r1
deleted file mode 100644
index d0f6b87e3786..000000000000
--- a/app-misc/gnutu-2.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-lang/mono-1.2.5.1-r1 || ( ( >=dev-dotnet/gtk-sharp-2.10.0 >=dev-dotnet/glade-sharp-2.10.0 ) >=dev-dotnet/gtk-sharp-2.12.21 ) sys-devel/gettext
-DESCRIPTION=GNU Student's Timetable for polish users
-EAPI=6
-HOMEPAGE=http://gnutu.devnull.pl/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/mono-1.2.5.1-r1 || ( ( >=dev-dotnet/gtk-sharp-2.10.0 >=dev-dotnet/glade-sharp-2.10.0 ) >=dev-dotnet/gtk-sharp-2.12.21 )
-SLOT=0
-SRC_URI=http://gnutu.devnull.pl/download/sources/gnutu-2.5.tar.gz
-_md5_=b8b86a22799a17edc7ccd237d4e82867
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
new file mode 100644
index 000000000000..f1a04ab4d517
--- /dev/null
+++ b/app-misc/gnutu/Manifest
@@ -0,0 +1,3 @@
+DIST gnutu-2.5.tar.gz 287100 BLAKE2B 1e5c140e33097643dac12c1018468f34946d232237a35d16993a6750a04e71b9a1d5eff4e0e8388de7f22d98cec173107ebdfe276cff5d2969bfd45dbcfac584 SHA512 b3ce4a39ca06cdb18459b64ca0ee167a735ae01dcac155c606d4ee61ace4d128540aa60f5ca2c0a5ed9ed561a7b1ebe02cd1dd4cffe79c3f0cbb8af831fdcd82
+EBUILD gnutu-2.5-r1.ebuild 512 BLAKE2B 382153d197607ac27748f74c75c9a330d4f6428549117631a2e9fa3044b1ea2cd54da5e10d53574760b7ed4fe890b04d4073e27020efbfc46cad28c5de913eb1 SHA512 e15fdc1bdae88c4a012108142ccc424d7342661cf6e361d7fe5ab1c5fa10cc813a932c9770d515eecab5cb883c7c55f84c4d8c2189d3183d0b773ec84e7063ca
+MISC metadata.xml 873 BLAKE2B c317e6972dd81efa9ceebc224f089b9661c77be69894f0062f5e7e93cb5e17967ac683bba1c47332ec6448b6ae05d6db6835d25d3252e631dd893254307e1907 SHA512 c8954a8cd9ba16d5bb61e47ec33eec0c8631ebcffb01e324ddb2fd3cb7de1bf8c989d7a8e209449e99af1e72cd0aa86881ac6f22a63a5b3a63801cd22e15547b
diff --git a/app-misc/gnutu/gnutu-2.5-r1.ebuild b/app-misc/gnutu/gnutu-2.5-r1.ebuild
new file mode 100644
index 000000000000..2c00123b072a
--- /dev/null
+++ b/app-misc/gnutu/gnutu-2.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GNU Student's Timetable for polish users"
+HOMEPAGE="http://gnutu.devnull.pl/"
+SRC_URI="http://gnutu.devnull.pl/download/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-lang/mono-1.2.5.1-r1
+ || ( ( >=dev-dotnet/gtk-sharp-2.10.0 >=dev-dotnet/glade-sharp-2.10.0 ) >=dev-dotnet/gtk-sharp-2.12.21 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
diff --git a/app-misc/gnutu/metadata.xml b/app-misc/gnutu/metadata.xml
new file mode 100644
index 000000000000..3fa328ef2ad6
--- /dev/null
+++ b/app-misc/gnutu/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ GNUTU is a polish program. It is designed for students from primary and
+ secondary schools – using it, you can note various information (like marks,
+ tests dates and important school events). It also can create various statistics,
+ calculate your average; it can also serve as a journal and many, many more...
+ </longdescription>
+ <longdescription lang="ja">
+ GNUTUã¯ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªžã®ãƒ—ログラムã§ã™ã€‚GNUTUã¯å­¦ç”Ÿã®ãŸã‚ã«ä½œã£ãŸãƒ—ログラムã§ã™ã€‚ã“ã®
+ プログラムã§ã€è‰²ã€…ãªã“ã¨(ノートやテストã®å¹´æœˆæ—¥ã‚„å¿…è¦ãªã‚¤ãƒ™ãƒ³ãƒˆ)ã‚’å–れる。統計を
+ 作ã£ã¦ã€ç‚¹æ•°å‰²ã‚Šå‡ºã™ã‚‚出æ¥ã‚‹ã€‚
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/go-jira-1.0.17 b/app-misc/go-jira-1.0.17
deleted file mode 100644
index b021e9414fcc..000000000000
--- a/app-misc/go-jira-1.0.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A simple JIRA commandline client in Go
-EAPI=6
-HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.17.tar.gz -> go-jira-1.0.17.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
-_md5_=3892f0fe4447f3c3be8c5e11caeca322
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
new file mode 100644
index 000000000000..5360e15458da
--- /dev/null
+++ b/app-misc/go-jira/Manifest
@@ -0,0 +1,3 @@
+DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
+EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
+MISC metadata.xml 336 BLAKE2B e4bdd5129c1bc5e5a26f4ae70fa1528c9a5ee2811fa5df2e5876ea3f1044afa3327a3b9897b199b2f18b451bae57da965371f8184196b299a036843bce3ed494 SHA512 37e0c43ce89345c1e0136e8e1f162abd77def9f295ddd8abc3b49f638847a1c08c41cb1055415aeb5a3ce5d1eab37b9ca2654764255ea6ccf9d76adc0a5f8009
diff --git a/app-misc/go-jira/go-jira-1.0.17.ebuild b/app-misc/go-jira/go-jira-1.0.17.ebuild
new file mode 100644
index 000000000000..6092975389c0
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="amd64"
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${WORKDIR}/${P}" go build -v -o jira cmd/jira/main.go || die
+ popd || die
+}
+
+src_install() {
+ dobin src/${EGO_PN}/jira
+ dodoc src/${EGO_PN}/{CHANGELOG,README}.md
+}
diff --git a/app-misc/go-jira/metadata.xml b/app-misc/go-jira/metadata.xml
new file mode 100644
index 000000000000..88682910c611
--- /dev/null
+++ b/app-misc/go-jira/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Netflix-Skunkworks/go-jira</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/golly-2.7-r1 b/app-misc/golly-2.7-r1
deleted file mode 100644
index f4c493d5d668..000000000000
--- a/app-misc/golly-2.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst setup
-DEPEND=dev-lang/perl sys-libs/zlib x11-libs/wxGTK:3.0[X] >=sys-apps/sed-4
-DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
-EAPI=5
-HOMEPAGE=http://golly.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl sys-libs/zlib x11-libs/wxGTK:3.0[X] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/golly/golly-2.7-src.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9927a894aa1722c1cda2e81542431f93
diff --git a/app-misc/golly-2.8 b/app-misc/golly-2.8
deleted file mode 100644
index 3cc627f41d72..000000000000
--- a/app-misc/golly-2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst setup
-DEPEND=dev-lang/perl virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X] >=sys-apps/sed-4
-DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
-EAPI=6
-HOMEPAGE=http://golly.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/golly/golly-2.8-src.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0b58c7bfc0d6b88d39d10df8184f6bd
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
new file mode 100644
index 000000000000..12fab431020d
--- /dev/null
+++ b/app-misc/golly/Manifest
@@ -0,0 +1,5 @@
+DIST golly-2.7-src.tar.gz 3881882 BLAKE2B 1989ff56049b7a182cbca35e33ac287c279ebac69acc5d07ac5122e8ccffef978a2e063c0587813d177a6311c854c6d52c2e80a5919107f9c6b17947a5e5f1ab SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
+DIST golly-2.8-src.tar.gz 4087191 BLAKE2B 4029b9bd30624cf2253dc5524c998f7e50648d39bc8dccf23b5c6b586989a641dde17b9fe35f16043d0f0d4a60da46729b31a9715b5d07950d610ea41a93a7a5 SHA512 bd86f685d180687814a44aa51edf4952a5af9024abb76d6b30faf1229edc86a1ba4e1f2c13f249f604d483fbde1a6db05150263450935b5bb073c155ad166a53
+EBUILD golly-2.7-r1.ebuild 1016 BLAKE2B f4d11a14b186a071c7c4e3d22fed0f86ba01b60cf05594e5fa5d36b92efbdb88791130cca30b5b53509357521cac6c8e38714e6ce7eb29892dacf23d948abcc0 SHA512 28c118e5bd8542699bd89517e301a169dcb0961920fe66958329bf4570c3e6a53446069850d24553ac6f9ab69b99445a51888281edcb34d83a54f79497428216
+EBUILD golly-2.8.ebuild 1128 BLAKE2B d5c9c5cb9b3d06720ba88a80026b04dd7a9ba46bff7aea77b394e99fa25d541aaf70ed3319ad1b83ca624b901ffe943f104407a0037d5385e63a6bfa45067e90 SHA512 fb2accd032fc55513a560f8a18fed679520128a38bf025e0d85616fe44e55f58e2d3d1bd993fbcccf5db99a98fd13ae33d1c6f60ed34ee95b19924ea4e6aa06d
+MISC metadata.xml 318 BLAKE2B 3521aab878976d7d846949477eb917c04e1c4cf04667b950e2b6e16ffa7dbae647a02a95759ed9069a763bcf6e059dc494f0e848574856177c2f71c5c8b32ce1 SHA512 38f971db2a96d7d2b20a3151b3000c01b0fbe4dac6ec537ff0fe662d50311afbaa42090edc5a91387ea83616d1b143ed104e9596d807b34799acceabd9c2c71f
diff --git a/app-misc/golly/golly-2.7-r1.ebuild b/app-misc/golly/golly-2.7-r1.ebuild
new file mode 100644
index 000000000000..b07bc8262aab
--- /dev/null
+++ b/app-misc/golly/golly-2.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-lang/perl
+ sys-libs/zlib
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}
+ ${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-src
+ECONF_SOURCE=gui-wx/configure
+
+src_configure() {
+ econf --with-perl-shlib="libperl.so"
+}
+
+src_install() {
+ emake docdir= DESTDIR="${D}" install
+ dodoc docs/ReadMe.html
+ newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/golly/golly-2.8.ebuild b/app-misc/golly/golly-2.8.ebuild
new file mode 100644
index 000000000000..1c6a36ee52e7
--- /dev/null
+++ b/app-misc/golly/golly-2.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-lang/perl
+ virtual/opengl
+ sys-libs/zlib
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}
+ ${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-src
+ECONF_SOURCE=gui-wx/configure
+
+pkg_setup() {
+ setup-wxwidgets
+}
+
+src_configure() {
+ append-libs -lGL -ldl
+ econf \
+ --with-perl-shlib="libperl.so" \
+ --with-wxshared
+}
+
+src_install() {
+ emake docdir= DESTDIR="${D}" install
+ dodoc docs/ReadMe.html
+ newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
new file mode 100644
index 000000000000..f40f0dd4325f
--- /dev/null
+++ b/app-misc/golly/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">golly</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/goobook-1.9 b/app-misc/goobook-1.9
deleted file mode 100644
index ffcc026f1ad3..000000000000
--- a/app-misc/goobook-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Google Contacts wrapper for mutt
-EAPI=5
-HOMEPAGE=https://gitlab.com/goobook/goobook
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gdata-2.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hcs-utils-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.4.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/goobook/goobook-1.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ac4935b2e0c67d470acbecabedc27df
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
new file mode 100644
index 000000000000..45c2b3fa6716
--- /dev/null
+++ b/app-misc/goobook/Manifest
@@ -0,0 +1,3 @@
+DIST goobook-1.9.tar.gz 29274 BLAKE2B 1c2b0b04a7bd21135395d9c3965095973d6a67a9ecb1a6bbe948864eb8bd0e4ed86197de6f5545ce112cc8538abb5ab9fb773b72b569bc9f16c67dcbcd432d5e SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81
+EBUILD goobook-1.9.ebuild 1283 BLAKE2B 3c2d2f5e9abd108e7b862277a2ad4e7a1210b54020bedaaf2852c0676ab5bfc0a780b178b9834bfde07a3f06962c88407d622f92ba1320846519d22a9a0ce077 SHA512 6e2b832fa37515cf0261aa6470d3574030bfb77c3b31341727bdaea88dab105d282209d7b9715af4fe4b6cad81666f403f899ac144ba70b203a323753f1680f1
+MISC metadata.xml 236 BLAKE2B 0b441545ebad176e67b82577d407fc280cea06ace296cf2093a27e857949f54a26223f5abbe647a0fb0af84ca1d5de8cf65a9bd42ff94d800811b35d851c95b1 SHA512 6b64fd0f7010bcab565170cca870128cf8146528f82ec1ae7c0d8a0e1d128f0259023ced9f021e5f3b467727164b95f0a9324caf71d14acc8c83ac7a0be42254
diff --git a/app-misc/goobook/goobook-1.9.ebuild b/app-misc/goobook/goobook-1.9.ebuild
new file mode 100644
index 000000000000..4542ff94344e
--- /dev/null
+++ b/app-misc/goobook/goobook-1.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 readme.gentoo
+
+DESCRIPTION="Google Contacts wrapper for mutt"
+HOMEPAGE="https://gitlab.com/goobook/goobook"
+SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/gdata-2.0.7[${PYTHON_USEDEP}]
+ >=dev-python/hcs-utils-1.3[${PYTHON_USEDEP}]
+ >=dev-python/keyring-0.2[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/oauth2client-1.4.11[${PYTHON_USEDEP}]"
+
+DEPEND="${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+ distutils-r1_src_install
+ readme.gentoo_create_doc
+}
+
+FORCE_PRINT_ELOG=1 # remove in the next bump
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+To setup initial authentication, execute:
+
+~ $ goobook authenticate
+
+If you want to use goobook from mutt, add this in your .muttrc file:
+ set query_command=\"goobook query '%s'\"
+to query address book.
+
+You may find more information and advanced configuration tips at
+https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
new file mode 100644
index 000000000000..df79387b9d9e
--- /dev/null
+++ b/app-misc/goobook/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="pypi">goobook</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gourmet-0.17.4-r2 b/app-misc/gourmet-0.17.4-r2
deleted file mode 100644
index 04050e41ee9b..000000000000
--- a/app-misc/gourmet-0.17.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pygtk-2.22.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.9-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] i18n? ( dev-python/elib-intl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipython? ( >=dev-python/ipython-0.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdf? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) print? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( >=dev-python/gtkspell-python-2.25.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/intltool >=dev-python/python-distutils-extra-2.37-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Recipe Organizer and Shopping List Generator for Gnome
-EAPI=5
-HOMEPAGE=https://thinkle.github.com/gourmet/
-IUSE=-i18n -ipython pdf print spell sound web python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/pygtk-2.22.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.9-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] i18n? ( dev-python/elib-intl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipython? ( >=dev-python/ipython-0.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdf? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) print? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( >=dev-python/gtkspell-python-2.25.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz -> gourmet-0.17.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32b3c320f718b00018a6a883ef169707
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
new file mode 100644
index 000000000000..77a7bbc4fc1b
--- /dev/null
+++ b/app-misc/gourmet/Manifest
@@ -0,0 +1,6 @@
+AUX gourmet-0.17.4-pyglet.patch 1664 BLAKE2B 1d995fab691dffcb654bb6da7960cb66340a1b3ad72d3caaaba957b04a39d41b5215df2318d2727332c537c35a4d1839471c288fdfea6d0d84bca9a9644d23fd SHA512 162b6b80b09326b15a1cbc8e045ba1fea36bfc106a6f1182659c890e0c100c0820b4f42f24f154be2f8fe2f457e212ace9c989002f33ea26523b1000b888c66e
+AUX no-docs-0.17.0.patch 338 BLAKE2B fae9f389c8ea29c275ac917358a572d2b7aabb98f114cf2a69a7ab84e9be8de501114ea0d471181bba8dbfce77768654f179ee9cbe34b3db14dc4a3823e535df SHA512 0e8f3c35411ee7f895490762acca7da2eff6e498de6c35511c90c2dd91dc6872f405b8a73465dd411eb193cbf0c8a37b75a5dd06e89e8601e268bffbe6f674ba
+AUX tostring-to-tobytes.patch 988 BLAKE2B 05dad2fbf164fa5cc13bcdb831bd05444829c712fa3930a0221a3b47ee21e2c32ae30858d2d06b84f20ba3d7764c402605ce89496c6c5b5d33078eed1f3fdd77 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c
+DIST gourmet-0.17.4.tar.gz 8487830 BLAKE2B 511da1ae85a788fdce622cb9eb1822e6f264daffc76f25ceb8148de0a4658d9a2307278e6e981073d1aed0fa6e96d543386ed7357e0c9a3c1b511bd107dee62d SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e
+EBUILD gourmet-0.17.4-r2.ebuild 2312 BLAKE2B 817f9e8f3b3cc8609eba941a3406b7ee4dfd8e3ee789337cb36fe1b6d14c734d0f20243d32d4dded941f3e7c8c9502ad6cd10431411c66ed4889d455c36a1e99 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c
+MISC metadata.xml 1559 BLAKE2B 827915e778b988f9e264492d1f499254fcdf5f4403804396a3a7dd79cf9b4fe527f53208d67a56fe720223434e8044b16118cc4969bb530ad2295f687941ef7b SHA512 67cb0b91052e1a2b0cd917839f796435cd45fe157e69d1ac8fbad7a3f4e09176db9f8d217edf0dd032cdc5b20a1e1c2ab3c56e57ddb8e291f55e5a1ff27764bf
diff --git a/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch b/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
new file mode 100644
index 000000000000..1547cde8f00d
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
@@ -0,0 +1,56 @@
+diff --git a/gourmet/sound.py b/gourmet/sound.py
+index 2dea6bb7..c232d258 100644
+--- a/gourmet/sound.py
++++ b/gourmet/sound.py
+@@ -1,15 +1,19 @@
+ try:
+- from sound_gst import Player
++ from sound_pyglet import Player
+ except ImportError:
+- print 'No gst player'
++ print 'No pyglet player'
+ try:
+- from sound_windows import Player
++ from sound_gst import Player
+ except ImportError:
+- print 'No windows player'
+- import sys
+- class Player:
+- """Fallback player"""
+- def play_file (self,path):
+- print 'No player installed -- beeping instead'
+- for n in range(5): sys.stdout.write('\a'); sys.stdout.flush()
++ print 'No gst player'
++ try:
++ from sound_windows import Player
++ except ImportError:
++ print 'No windows player'
++ import sys
++ class Player:
++ """Fallback player"""
++ def play_file (self,path):
++ print 'No player installed -- beeping instead'
++ for n in range(5): sys.stdout.write('\a'); sys.stdout.flush()
+
+diff --git a/gourmet/sound_pyglet.py b/gourmet/sound_pyglet.py
+new file mode 100644
+index 00000000..41da613a
+--- /dev/null
++++ b/gourmet/sound_pyglet.py
+@@ -0,0 +1,16 @@
++import pyglet
++
++class Player:
++ def __init__ (self):
++ pass
++
++ def play_file (self,path):
++ self.source = pyglet.media.load(path,streaming=False)
++ self.source.play()
++
++ def stop_play (self,path):
++ pass
++
++if __name__ == '__main__':
++ p = Player()
++ p.play_file('../data/sound/phone.wav')
diff --git a/app-misc/gourmet/files/no-docs-0.17.0.patch b/app-misc/gourmet/files/no-docs-0.17.0.patch
new file mode 100644
index 000000000000..9002a2ef3384
--- /dev/null
+++ b/app-misc/gourmet/files/no-docs-0.17.0.patch
@@ -0,0 +1,10 @@
+--- setup.py 2014-03-02 14:56:56.090600468 -0500
++++ setup.py 2014-03-02 14:57:00.184465687 -0500
+@@ -141,7 +141,6 @@
+
+ files.extend(data_files)
+ files.extend([(os.path.join(base,'ui'), glob.glob(os.path.join('ui','*.ui')))])
+- files.extend([(os.path.join('share','doc','gourmet'), ['FAQ', 'LICENSE'])])
+
+ return files
+
diff --git a/app-misc/gourmet/files/tostring-to-tobytes.patch b/app-misc/gourmet/files/tostring-to-tobytes.patch
new file mode 100644
index 000000000000..e42c59403d51
--- /dev/null
+++ b/app-misc/gourmet/files/tostring-to-tobytes.patch
@@ -0,0 +1,26 @@
+diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py
+index 0e01735..efa6463 100644
+--- a/gourmet/gtk_extras/ratingWidget.py
++++ b/gourmet/gtk_extras/ratingWidget.py
+@@ -135,7 +135,7 @@ class StarGenerator:
+ if is_rgba: rowstride = 4
+ else: rowstride = 3
+ pb=gtk.gdk.pixbuf_new_from_data(
+- image.tostring(),
++ image.tobytes(),
+ gtk.gdk.COLORSPACE_RGB,
+ is_rgba,
+ 8,
+diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py
+index 61c772c..2e7b08b 100644
+--- a/gourmet/plugins/browse_recipes/icon_helpers.py
++++ b/gourmet/plugins/browse_recipes/icon_helpers.py
+@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image):
+ if is_rgba: rowstride = 4
+ else: rowstride = 3
+ pb=gtk.gdk.pixbuf_new_from_data(
+- image.tostring(),
++ image.tobytes(),
+ gtk.gdk.COLORSPACE_RGB,
+ is_rgba,
+ 8,
diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
new file mode 100644
index 000000000000..0e0dd28ffa97
--- /dev/null
+++ b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
+HOMEPAGE="https://thinkle.github.com/gourmet/"
+SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="-i18n -ipython pdf print spell sound web"
+
+RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-0.7.9-r1[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ i18n? ( dev-python/elib-intl[${PYTHON_USEDEP}] )
+ ipython? ( >=dev-python/ipython-0.13.2[${PYTHON_USEDEP}] )
+ pdf? (
+ >=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+ >=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}]
+ )
+ print? (
+ >=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+ >=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}]
+ )
+ spell? ( >=dev-python/gtkspell-python-2.25.3-r1[${PYTHON_USEDEP}] )
+ sound? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+ web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ >=dev-python/python-distutils-extra-2.37-r1[${PYTHON_USEDEP}]"
+
+PATCHES=( ${FILESDIR}/no-docs-0.17.0.patch \
+ ${FILESDIR}/tostring-to-tobytes.patch \
+ ${FILESDIR}/${PN}-${PV}-pyglet.patch )
+DOCS=( ChangeLog CODING.md FAQ README.md TESTS TODO.md )
+
+python_prepare_all() {
+ # Modify these lines before copying them out
+ sed -i "s:base_dir = '..':base_dir = '/usr/share':" gourmet/settings.py || die
+ sed -i 's:data_dir = os.path.join(base_dir, "gourmet", "data"):data_dir = os.path.join(base_dir, "gourmet"):' gourmet/settings.py || die
+ sed -i 's:\(icon_base = os.path.join(data_dir,\) "icons",:\1 "gourmet",:' gourmet/settings.py || die
+ sed -i 's:\(locale_base = os.path.join(base_dir, "gourmet",\) "build",:\1:' gourmet/settings.py || die
+ sed -i 's:\(plugin_base = os.path.join(base_dir,\) "gourmet", "build", "share",:\1:' gourmet/settings.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+ distutils-r1_python_prepare
+ sed -i "s:\(lib_dir = \)'../gourmet':\1'$(python_get_sitedir)':" gourmet/settings.py || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman gourmet.1
+}
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
new file mode 100644
index 000000000000..90652c4bf09f
--- /dev/null
+++ b/app-misc/gourmet/metadata.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>nixphoeni@gentoo.org</email>
+ <name>Joe Sapp</name>
+ </maintainer>
+ <longdescription>
+ Gourmet Recipe Manager is an application to store, organize
+ and search recipes. Gourmet also makes it easy to create
+ shopping lists from recipes. Gourmet imports recipes from a
+ number of sources, including MealMaster and MasterCook
+ archives and several popular websites. Gourmet can export
+ recipes as text, MealMaster files, HTML web pages, PDF, and
+ a custom XML format for exchange with other Gourmet users.
+ Gourmet supports linking images with recipes.
+ </longdescription>
+ <upstream>
+ <maintainer>
+ <email>Thomas_Hinkle@alumni.brown.edu</email>
+ <name>Thomas Mills Hinkle</name>
+ </maintainer>
+ <maintainer>
+ <email>ockham@raz.or.at</email>
+ <name>Bernhard Reiter</name>
+ </maintainer>
+ <bugs-to>https://github.com/thinkle/gourmet/issues</bugs-to>
+ <remote-id type="github">thinkle/gourmet</remote-id>
+ </upstream>
+ <use>
+ <flag name="i18n">
+ Enable support for i18n through elib.intl
+ </flag>
+ <flag name="ipython">
+ Enable support for the interactive Python console plugin
+ </flag>
+ <flag name="pdf">Enable export to PDF</flag>
+ <flag name="print">
+ Enable pretty Python printing
+ </flag>
+ <flag name="spell">
+ Enable support for the spell check plugin
+ </flag>
+ <flag name="web">
+ Enable support for the web import plugin
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/grabcartoons-2.8.4_p20141112 b/app-misc/grabcartoons-2.8.4_p20141112
deleted file mode 100644
index 606a2954e835..000000000000
--- a/app-misc/grabcartoons-2.8.4_p20141112
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Comic-summarizing utility
-EAPI=6
-HOMEPAGE=https://zzamboni.org/code/grabcartoons/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> grabcartoons-2.8.4_p20141112.tar.gz
-_eclasses_=vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=6a4955d2488327be4a7516962e96d53b
diff --git a/app-misc/grabcartoons-9999 b/app-misc/grabcartoons-9999
deleted file mode 100644
index 9b15cda3ee72..000000000000
--- a/app-misc/grabcartoons-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Comic-summarizing utility
-EAPI=6
-HOMEPAGE=https://zzamboni.org/code/grabcartoons/
-LICENSE=BSD
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
-RESTRICT=test
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=6a4955d2488327be4a7516962e96d53b
diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
new file mode 100644
index 000000000000..4bb539fdec43
--- /dev/null
+++ b/app-misc/grabcartoons/Manifest
@@ -0,0 +1,5 @@
+AUX 2.8.4-fix-install-paths.patch 1189 BLAKE2B bb9e00721bcc4cbb766e6ddb432b49a0b0b2c9525a020a4a798ca8b80a4d2cbe3b8caa9383a6f8dba3804283df31f7eb17b8219d231dccb6c3ded1227cddf8c5 SHA512 3983cb0487cd1f770c985700297df01d5f33761d8dbacad413a3e50c315a999ae3a70a918b46149928124e6e4a299a8f4994bf60fec990aea6a87313bbc283ec
+DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 BLAKE2B 616dde080c8e35548a527ede7c844fb23b733408bb21ce621065d698220111637b9cf8b044d56dabc6b0987123c656743a8c111b8e9c01cbeb589ed3bf35eb94 SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5
+EBUILD grabcartoons-2.8.4_p20141112.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455
+EBUILD grabcartoons-9999.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455
+MISC metadata.xml 253 BLAKE2B e1d15b2d2944cde7e6a52fba9fb0c75d3e73d2f1182572c7cd567f3658304d159f262476924df02b9c2924114283ec96cc24ef804fca9153a402a3b0208c1809 SHA512 8c92aefe6448e9d697177aaf5e6f5b08423d728ded122b1cec119079998e8e63c74558260b6b26bfddd6a0c7b50d13dbf4a825c5a126389885ffb75bf2ee478c
diff --git a/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch b/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch
new file mode 100644
index 000000000000..420640b3de6c
--- /dev/null
+++ b/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index a1f53e6..0a9bec4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,9 +23,9 @@ all:
+
+ install:
+ mkdir -p -m 755 $(PREFIX)/bin
+- mkdir -p -m 755 $(PREFIX)/lib/grabcartoons/modules
+- install -m 755 grabcartoons.pl $(PREFIX)/bin
+- install -m 644 modules/*.pl $(PREFIX)/lib/grabcartoons/modules
++ mkdir -p -m 755 $(PREFIX)/share/grabcartoons/modules
++ install -m 755 grabcartoons.pl $(PREFIX)/bin/grabcartoons
++ install -m 644 modules/*.pl $(PREFIX)/share/grabcartoons/modules
+
+ test:
+ ./grabcartoons.pl $(V) "$(C)" > "$(OUT)"
+diff --git a/grabcartoons.pl b/grabcartoons.pl
+index cdc4152..d732301 100755
+--- a/grabcartoons.pl
++++ b/grabcartoons.pl
+@@ -38,8 +38,8 @@ $XTRN_CMD="$XTRN_PROG -q -O- $USER_AGENT_CMD";
+ # Where to load cartoon modules from
+ @MODULE_DIRS=("$FindBin::Bin/modules",
+ "$FindBin::RealBin/modules",
+- "$FindBin::Bin/../lib/grabcartoons/modules",
+- "$FindBin::RealBin/../lib/grabcartoons/modules",
++ "$FindBin::Bin/../share/grabcartoons/modules",
++ "$FindBin::RealBin/../share/grabcartoons/modules",
+ "$HOME/.grabcartoons/modules",
+ "$HOME/.grabcartoons",
+ @GRABCARTOONS_DIRS,
diff --git a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
new file mode 100644
index 000000000000..6a318e06fa51
--- /dev/null
+++ b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Comic-summarizing utility"
+HOMEPAGE="https://zzamboni.org/code/grabcartoons/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+# Opens a web page, which is unacceptable during an emerge.
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/perl
+ virtual/perl-Getopt-Long"
+
+PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch )
+
+src_install() {
+ emake PREFIX="${ED%/}"/usr install
+ einstalldocs
+}
diff --git a/app-misc/grabcartoons/grabcartoons-9999.ebuild b/app-misc/grabcartoons/grabcartoons-9999.ebuild
new file mode 100644
index 000000000000..6a318e06fa51
--- /dev/null
+++ b/app-misc/grabcartoons/grabcartoons-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Comic-summarizing utility"
+HOMEPAGE="https://zzamboni.org/code/grabcartoons/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+# Opens a web page, which is unacceptable during an emerge.
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/perl
+ virtual/perl-Getopt-Long"
+
+PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch )
+
+src_install() {
+ emake PREFIX="${ED%/}"/usr install
+ einstalldocs
+}
diff --git a/app-misc/grabcartoons/metadata.xml b/app-misc/grabcartoons/metadata.xml
new file mode 100644
index 000000000000..53bef2c91710
--- /dev/null
+++ b/app-misc/grabcartoons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">zzamboni/grabcartoons</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gramps-4.2.5 b/app-misc/gramps-4.2.5
deleted file mode 100644
index cf67206a2958..000000000000
--- a/app-misc/gramps-4.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-DESCRIPTION=Genealogical Research and Analysis Management Programming System
-EAPI=6
-HOMEPAGE=https://gramps-project.org/
-IUSE=+reports exif geo spell python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/bsddb3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pyicu[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/gramps-project/gramps/archive/v4.2.5.tar.gz -> gramps-4.2.5.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=774fd0ac4e9b1b59442ae6aeb2bdae93
diff --git a/app-misc/gramps-4.2.8 b/app-misc/gramps-4.2.8
deleted file mode 100644
index 63917a998509..000000000000
--- a/app-misc/gramps-4.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-DESCRIPTION=Genealogical Research and Analysis Management Programming System
-EAPI=6
-HOMEPAGE=https://gramps-project.org/
-IUSE=+rcs +reports exif geo postscript spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/bsddb3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyicu[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/gramps-project/gramps/archive/v4.2.8.tar.gz -> gramps-4.2.8.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9e347a55de96527b068a865feec86cd
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
new file mode 100644
index 000000000000..95248535a4bd
--- /dev/null
+++ b/app-misc/gramps/Manifest
@@ -0,0 +1,6 @@
+AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
+DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
+DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
+EBUILD gramps-4.2.5.ebuild 1336 BLAKE2B fbf43f646f953dc31e245f29e2efb6c0cbccceac8272162819aaab5363d284a821ec7220c022563085e3540c2ff23e57e766a88e74bf0dece8e7188fd5b3b4b8 SHA512 4eb326bcf7909cdf56ed57d0d97203003b34472e4c6a5c774c8b55f09afcec64ef1e3ae93acb21fff40343e78179cf5fafaa6b7d3e587636b4dfca481435cb27
+EBUILD gramps-4.2.8.ebuild 1606 BLAKE2B 8a147903eb6ae7c9d75328977b6fbab798a40ae3bb9d51fb600488f780bd3194213e949f257039c87dc8d2180bf5523dae567bb54feffa09ed36d009c02d1bd4 SHA512 f324c0791d404b280784e77edd660b313e647d3bd6d8849568b7ef13816d6329f6f340c7c4ff000f7d88c054e64511b0313cd24b492319341fa35d2babd96b7b
+MISC metadata.xml 5730 BLAKE2B 0f0915a541ef3aebaa124fcd3914db315b0d0ab72ed50af26fa9010a28b5bf5f8514dfe280041d4c7fb7aecc904ccf6d32708074048e05f68efc75c2c7dc7163 SHA512 2b5bdbffe1c49e83a5df03d2158dfe3bce9a746c1ac07b15f6421c3c18ee6a5b24998e59b942482ce788820afc9f508d956f06a1472b65cebb36044dd648e48d
diff --git a/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
new file mode 100644
index 000000000000..8d43447027dc
--- /dev/null
+++ b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
@@ -0,0 +1,33 @@
+diff --git a/setup.py b/setup.py
+index 0177ce7..7aaa681 100644
+--- a/setup.py
++++ b/setup.py
+@@ -160,27 +160,8 @@ def build_man(build_cmd):
+ subst_vars = (('@VERSION@', VERSION), )
+ substitute_variables(filename, newfile, subst_vars)
+
+- import gzip
+- man_file_gz = os.path.join(newdir, 'gramps.1.gz')
+- if os.path.exists(man_file_gz):
+- if newer(filename, man_file_gz):
+- os.remove(man_file_gz)
+- else:
+- filename = False
+- os.remove(newfile)
+-
+- if filename:
+- #Binary io, so open is OK
+- with open(newfile, 'rb') as f_in,\
+- gzip.open(man_file_gz, 'wb') as f_out:
+- f_out.writelines(f_in)
+- log.info('Compiling %s >> %s', filename, man_file_gz)
+-
+- os.remove(newfile)
+- filename = False
+-
+ lang = man_dir[8:]
+- src = build_cmd.build_base + '/data/man/' + lang + '/gramps.1.gz'
++ src = build_cmd.build_base + '/data/man/' + lang + '/gramps.1'
+ target = 'share/man/' + lang + '/man1'
+ data_files.append((target, [src]))
+
diff --git a/app-misc/gramps/gramps-4.2.5.ebuild b/app-misc/gramps/gramps-4.2.5.ebuild
new file mode 100644
index 000000000000..bc0c6b1ef46b
--- /dev/null
+++ b/app-misc/gramps/gramps-4.2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5} )
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+reports exif geo spell"
+
+RDEPEND="
+ dev-python/bsddb3[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+ dev-python/pyicu[${PYTHON_USEDEP}]
+ gnome-base/librsvg:2
+ >x11-libs/gtk+-3.14.8:3[introspection]
+ x11-libs/pango[introspection]
+ x11-misc/xdg-utils
+ reports? ( media-gfx/graphviz )
+ exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+ geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+ spell? ( app-text/gtkspell:3[introspection] )
+"
+
+python_configure_all() {
+ mydistutilsargs=( --resourcepath=/usr/share )
+}
+
+python_prepare_all() {
+ # Install documentation to the proper location. This can't be done
+ # easily with a patch because we substitute in the $PF variable,
+ # and that changes with every revision.
+ sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/app-misc/gramps/gramps-4.2.8.ebuild b/app-misc/gramps/gramps-4.2.8.ebuild
new file mode 100644
index 000000000000..0534c161464e
--- /dev/null
+++ b/app-misc/gramps/gramps-4.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+ dev-python/bsddb3[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+ dev-python/pyicu[${PYTHON_USEDEP}]
+ gnome-base/librsvg:2
+ >x11-libs/gtk+-3.14.8:3[introspection]
+ x11-libs/pango[introspection]
+ x11-misc/xdg-utils
+ reports? ( media-gfx/graphviz[postscript?] )
+ exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+ geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+ spell? ( app-text/gtkspell:3[introspection] )
+ rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+ # Install documentation to the proper location. This can't be done
+ # easily with a patch because we substitute in the $PF variable,
+ # and that changes with every revision.
+ sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+ eapply "${FILESDIR}/${P}-uncompressed-docs.patch"
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ mydistutilsargs=( --resourcepath=/usr/share )
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
new file mode 100644
index 000000000000..f7eab38a8930
--- /dev/null
+++ b/app-misc/gramps/metadata.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>herb@hlmjr.com</email>
+ <name>Herb Miller Jr. (herbmillerjr)</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ GRAMPS helps you track your family tree. It allows you to store, edit,
+ and research genealogical data. GRAMPS attempts to provide all of the
+ common capabilities of other genealogical programs, but, more
+ importantly, to provide an additional capability of integration not
+ common to these programs. This is the ability to input any bits and
+ pieces of information directly into GRAMPS and rearrange/manipulate
+ any/all data events in the entire data base (in any order or sequence)
+ to assist the user in doing research, analysis and correlation with
+ the potential of filling relationship gaps.
+ </longdescription>
+ <longdescription lang="cs">
+ GRAMPS Vám pomůže sledovat Váš rodokmen. Dovolí Vám využít poÄítaÄ pro
+ ukládání, úpravy a zkoumání genealogických dat.
+
+ GRAMPS se snaží nabídnout všechny vlastnosti obvyklé u jiných
+ dostupných genealogických programů. Oproti nim však poskytuje další
+ možnosti integrace, které u těchto programů nejsou běžné. Je to
+ možnost vložit jakýkoli kus informace přímo do GRAMPS a
+ přeskupit/manipulovat jednotlivými/všemi událostmi v celé
+ databázi. Tím pomáhá badateli při výzkumu, analýze a korelacích s
+ potenciálem zaplnění mezer ve vztazích mezi subjekty.
+ </longdescription>
+ <longdescription lang="de">
+ GRAMPS hilft dir, deinen Familienstammbaum zurückzuverfolgen. Es
+ erlaubt dir das Speichern, Bearbeiten, und Erforschen genealogischer
+ Daten mit deinem Computer. GRAMPS versucht alle möglichen Funktionen,
+ die andere genealogische Programme bieten einzubeziehen, aber noch
+ viel wichtiger, die Möglichkeit des einfachen Imports fremder Daten zu
+ bieten. Das ist die Fähigkeit jedes noch so kleine Detail direkt in
+ GRAMPS einzugeben und alle damit verbundenen Daten und Events in der
+ gesamten Datenbank neu zu ordnen oder zu manipulieren um die Arbeit
+ für den Benutzer zu erleichtern. So können jederzeit potentielle
+ Lücken in jeglichen Beziehungen gefüllt werden.
+ </longdescription>
+ <longdescription lang="fr">
+ GRAMPS vous aide à suivre votre lignée. Il vous permet de stocker,
+ éditer, ainsi que rechercher des données généalogiques avec votre
+ ordinateur. GRAMPS tente de fournir toutes les capacités communes aux
+ autres programmes généalogiques, mais, plus important, fournir des
+ capacités supplémentaires non communes à ces programmes. C'est la
+ capacité d'entrer toutes parties d'informations directement dans
+ GRAMPS et réarranger/manipuler quelques/toutes données événement dans
+ la base de données (dans n'importe quel ordre ou séquence) pour
+ assiter l'utilisateur dans ses recherches, analyse et corrélation avec
+ les relations possibles.
+ </longdescription>
+ <longdescription lang="nl">
+ GRAMPS laat je toe je familiestamboom op te stellen. Het programma
+ laat je toe om je genealogische gegevens op te slaan, te wijzigen en
+ genealogisch onderzoek te doen met je computer. GRAMPS probeert om
+ bovenover de gebruikelijke mogelijkheden die andere genealogische
+ programma's bieden, een verdergaande integratiemogelijkheid te geven
+ die die andere programma's niet hebben. Je kan zo alle stukjes en
+ gedeelten van informatie rechtstreeks in GRAMPS invoeren en achteraf
+ kan je dan deze gegevens bewerken/manipuleren. Dit kan je doen met het
+ volledige gegevensbestand( in gelijkwelke volgorde). Zo wordt de
+ gebruiker ondersteund in zijn onderzoeken biedt dit een hulp bij
+ analyse en de correlatie om zo relatieleemten te kunnen opvullen.
+ </longdescription>
+ <longdescription lang="pl">
+ GRAMPS pomaga Ci śledzić Twoje drzewo rodzinne. Pozwala Ci wprowadzać,
+ edytować i analizować informacje genealogiczne za pomocą
+ komputera. GRAMPS próbuje zapewnić wszystkie wspólne cechy innych
+ programów genealogicznych, ale, co ważniejsze, dostarczyć Ci
+ możliwości w nich nie dostępne. Ma możliwość wprowadzenia każdej
+ informacji i wiadomości bezpośrednio do programu i późniejszą analizę
+ i zmianę zdarzeń czy pojedynczo, czy grupowo (w dowolnej kolejności) w
+ celu pomocy użytkownikowi w analizie, badaniu i korelowaniu
+ potencjalnych luk w relacjach w rodzinie.
+ </longdescription>
+ <longdescription lang="sl">
+ GRAMPS vam pomaga voditi svoj rodovnik. Z njim lahko shranjujete,
+ urejate in raziskujete rodoslovne podatke na svojem
+ raÄunalniku. Pogram GRAMPS vkljuÄuje veÄino skupnih elementov drugih
+ rodoslovnih programov, poleg tega pa omogoÄa Å¡e funkcije, ki jih ti
+ programi obiÄajno nimajo. Med njimi sta npr. možnost vnosa
+ kakršnegakoli podatka neposredno v GRAMPS ter preurejanje in
+ spreminjanje vseh zapisov dogodkov v celotni bazi podatkov (ne glede
+ na vrstni red), kar vam bo v pomoÄ pri vaÅ¡ih raziskavah, analizah in
+ zapolnjevanju vrzeli v rodoslovnih podatkih.
+ </longdescription>
+ <use>
+ <flag name="geo">Enable rendering of geographical data using <pkg>sci-geosciences/osm-gps-map</pkg></flag>
+ <flag name="reports">All external software that is needed for graphical reports will be installed</flag>
+ <flag name="rcs">Adds support for family tree archives via <pkg>dev-vcs/rcs</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">gramps</remote-id>
+ <remote-id type="github">gramps-project/gramps</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/graphlcd-base-0.1.9 b/app-misc/graphlcd-base-0.1.9
deleted file mode 100644
index 577778f5eb43..000000000000
--- a/app-misc/graphlcd-base-0.1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/freetype virtual/pkgconfig
-DESCRIPTION=Graphical LCD Driver
-EAPI=6
-HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
-IUSE=g15
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype g15? ( app-misc/g15daemon )
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/501/graphlcd-base-0.1.9.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79c06c089bddb3c6458bfd5d05c85561
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
new file mode 100644
index 000000000000..4352e7a9f525
--- /dev/null
+++ b/app-misc/graphlcd-base/Manifest
@@ -0,0 +1,5 @@
+AUX graphlcd-base-0.1.5-nostrip.patch 3062 BLAKE2B ebcb8bf96457871e9cea6a5f8bff6e4458ff8c5f1868216645b1b5fca062904adbd3865784cf3fa260a7653e757f8e9cc534a411ed3b92cbe9f4e76ef7fccf84 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0
+AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45ee4f739d44eef28ec861040ca90b105cc8fa05ca1602d984c8ec9e08bcc8007825a3f87110f18371d530d65828b1a0d163fa9a98c2832a SHA512 7665e290b4e5e46fd62186ac1ab97b8245af8d96fa73e274e07c1660dc65c51c9b8048e4e5c0e316aa8c01233e758ef84c9202cf9142b1e92b9f172559081776
+DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
+EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9
+MISC metadata.xml 464 BLAKE2B 2f69a92ffc1ac13154404024dade395001526ee2a787526034fa68857b01d41cf278ac4b13814e8f116ba16fa7f9e576d6dc09be8dafd8e4804199dc6194d3ca SHA512 a1c66dfad0b364ba3f03d42701c22f7e67c81fcbd03e8e5228f5072aa78d05ad0b09554173131456d789771cd53d3f77898c46ed853216407ace1786870fbcf9
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch
new file mode 100644
index 000000000000..9973394f150b
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch
@@ -0,0 +1,75 @@
+remove strip -s in makefile
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 06 April 2007
+diff -Naur graphlcd-base-0.1.5.orig/tools/convpic/Makefile graphlcd-base-0.1.5/tools/convpic/Makefile
+--- graphlcd-base-0.1.5.orig/tools/convpic/Makefile 2007-04-06 20:34:29.000000000 +0200
++++ graphlcd-base-0.1.5/tools/convpic/Makefile 2007-04-06 20:35:17.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ install: $(PRGNAME)
+ install -d $(BINDIR)
+- install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
++ install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+
+ uninstall:
+ rm -f $(BINDIR)/$(PRGNAME)
+diff -Naur graphlcd-base-0.1.5.orig/tools/crtfont/Makefile graphlcd-base-0.1.5/tools/crtfont/Makefile
+--- graphlcd-base-0.1.5.orig/tools/crtfont/Makefile 2007-04-06 20:34:29.000000000 +0200
++++ graphlcd-base-0.1.5/tools/crtfont/Makefile 2007-04-06 20:35:32.000000000 +0200
+@@ -35,7 +35,7 @@
+
+ install: $(PRGNAME)
+ install -d $(BINDIR)
+- install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
++ install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+
+ uninstall:
+ rm -f $(BINDIR)/$(PRGNAME)
+diff -Naur graphlcd-base-0.1.5.orig/tools/genfont/Makefile graphlcd-base-0.1.5/tools/genfont/Makefile
+--- graphlcd-base-0.1.5.orig/tools/genfont/Makefile 2007-04-06 20:34:29.000000000 +0200
++++ graphlcd-base-0.1.5/tools/genfont/Makefile 2007-04-06 20:35:43.000000000 +0200
+@@ -38,7 +38,7 @@
+
+ install: $(PRGNAME)
+ install -d $(BINDIR)
+- install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
++ install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+
+ uninstall:
+ rm -f $(BINDIR)/$(PRGNAME)
+diff -Naur graphlcd-base-0.1.5.orig/tools/lcdtestpattern/Makefile graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile
+--- graphlcd-base-0.1.5.orig/tools/lcdtestpattern/Makefile 2007-04-06 20:34:29.000000000 +0200
++++ graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile 2007-04-06 20:35:57.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ install: $(PRGNAME)
+ install -d $(BINDIR)
+- install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
++ install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+
+ uninstall:
+ rm -f $(BINDIR)/$(PRGNAME)
+diff -Naur graphlcd-base-0.1.5.orig/tools/showpic/Makefile graphlcd-base-0.1.5/tools/showpic/Makefile
+--- graphlcd-base-0.1.5.orig/tools/showpic/Makefile 2007-04-06 20:34:29.000000000 +0200
++++ graphlcd-base-0.1.5/tools/showpic/Makefile 2007-04-06 20:36:09.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ install: $(PRGNAME)
+ install -d $(BINDIR)
+- install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
++ install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+
+ uninstall:
+ rm -f $(BINDIR)/$(PRGNAME)
+diff -Naur graphlcd-base-0.1.5.orig/tools/showtext/Makefile graphlcd-base-0.1.5/tools/showtext/Makefile
+--- graphlcd-base-0.1.5.orig/tools/showtext/Makefile 2007-04-06 20:34:29.000000000 +0200
++++ graphlcd-base-0.1.5/tools/showtext/Makefile 2007-04-06 20:36:21.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ install: $(PRGNAME)
+ install -d $(BINDIR)
+- install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
++ install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+
+ uninstall:
+ rm -f $(BINDIR)/$(PRGNAME)
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..cbdaf1ceb59a
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
@@ -0,0 +1,30 @@
+--- graphlcd-base-0.1.9/glcdgraphics/Makefile
++++ graphlcd-base-0.1.9/glcdgraphics/Makefile
+@@ -33,9 +33,9 @@
+ -include $(DEPFILE)
+
+ ifdef HAVE_FREETYPE2
+- ifneq ($(shell which freetype-config),)
+- INCLUDES += $(shell freetype-config --cflags)
+- LIBS += $(shell freetype-config --libs)
++ ifneq ($(shell which pkg-config),)
++ INCLUDES += $(shell pkg-config --cflags freetype2)
++ LIBS += $(shell pkg-config --libs freetype2)
+ else
+ INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
+ LIBS += -lfreetype
+--- graphlcd-base-0.1.9/tools/genfont/Makefile
++++ graphlcd-base-0.1.9/tools/genfont/Makefile
+@@ -9,10 +9,10 @@
+ OBJS = genfont.o
+
+ INCLUDES += -I../../
+-INCLUDES += `freetype-config --cflags`
++INCLUDES += `pkg-config --cflags freetype2`
+
+ LIBDIRS += -L../../glcdgraphics/
+-LIBS += `freetype-config --libs`
++LIBS += `pkg-config --libs freetype2`
+
+ all: $(PRGNAME)
+ .PHONY: all
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
new file mode 100644
index 000000000000..7c3f216d9771
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib
+
+VERSION="501" #every bump, new version
+
+DESCRIPTION="Graphical LCD Driver"
+HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="amd64 ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="g15"
+
+CDEPEND="media-libs/freetype"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ g15? ( app-misc/g15daemon )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.1.5-nostrip.patch"
+ "${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch"
+)
+
+src_prepare() {
+ sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
+
+ default
+
+ sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:"
+
+ #gcc-6 fix
+ sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:"
+}
+
+src_install() {
+ emake DESTDIR="${D}"/usr LIBDIR="${D}"/usr/$(get_libdir) install
+
+ insinto /etc
+ doins graphlcd.conf
+
+ local DOCS=( HISTORY README docs/* )
+
+ einstalldocs
+}
diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
new file mode 100644
index 000000000000..dd4d7485b6a3
--- /dev/null
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vdr@gentoo.org</email>
+ <name>gentoo-vdr-project</name>
+</maintainer>
+<longdescription lang="en">
+ This package provides Graphical LCD Driver.
+</longdescription>
+<use>
+ <flag name="g15">Add support for <pkg>app-misc/g15daemon</pkg> driver
+ (e.g. Logitech G15 Keybord)</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/grc-1.11-r1 b/app-misc/grc-1.11-r1
deleted file mode 100644
index d87ee74728f3..000000000000
--- a/app-misc/grc-1.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Generic Colouriser beautifies your logfiles or output of commands
-EAPI=6
-HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/garabik/grc/archive/v1.11.tar.gz -> grc-1.11.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4cafaffa966c38020944ad4df64526a9
diff --git a/app-misc/grc-1.5 b/app-misc/grc-1.5
deleted file mode 100644
index 1263106ace80..000000000000
--- a/app-misc/grc-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Generic Colouriser beautifies your logfiles or output of commands
-EAPI=5
-HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
-IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/grc/grc_1.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4ac38ee61d6e5b042fe2ac55504f2a00
diff --git a/app-misc/grc-1.9 b/app-misc/grc-1.9
deleted file mode 100644
index 7616abca0b34..000000000000
--- a/app-misc/grc-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Generic Colouriser beautifies your logfiles or output of commands
-EAPI=6
-HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/garabik/grc/archive/v1.9.tar.gz -> grc-1.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2c14cdd595a977fce94e86e8fa3a516
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
new file mode 100644
index 000000000000..48519013ed77
--- /dev/null
+++ b/app-misc/grc/Manifest
@@ -0,0 +1,14 @@
+AUX conf.configure 530 BLAKE2B 37d8b045c0938355f3c9d0f2150cb61c908fef06980252fdb32ee6ce1db9daf586631bff2578fb9f87aba8597c6238ec51a8f5821ed26b00a0f66d7cadc940dd SHA512 3db952ed800a959f5a69c52c0b1b2c36e3374547469fc437f82cc30271f813cf0ddec8719b4a20b4fedb3df411f9e526cef5cfec5823b663cce1ef8a2270955b
+AUX grc-1.4-ipv6.patch 408 BLAKE2B cf4abbae1b67b5390428e82d0e0053d2c3f828fbc22aeabed52fe2449cc6f11cf62d3aaf03846ed0d5255081ecb869992d5bf9fe0e879d75ff1947fbb2df1e39 SHA512 e84fe2b3de351ab24a86e97004b83e5494cde1147c447f3ed2cb354bdb7173180738c8b760efea780d71d536473904f97d9c04ff86c19e947b47ca1f963c0dc0
+AUX grc-1.4-support-more-files.patch 901 BLAKE2B a625da501d47451d5bda0e12f170af7df9f20d3d8848128cf9afa8013cffb9330aa2634c4243dc1a2e6d117d6ad4b2eea9cc9a3c4bc25b5983e53262b98e9e3b SHA512 0483c4d7adea1d813f62f7485845b470415f032726aae456fabab27486e26707931b70a12671b3e291528688e1546cb89d2cca7839b40cc2f365a6760d39edd7
+AUX grc-1.9-bash.patch 805 BLAKE2B f585f33bc8d04e8beecc54b36dab4db0bb4270ba388da93561e904696d9142749f2cc7dc48611f34919fddc4daaaf61e8603c8e4d8785b48d718c98c01858adc SHA512 75163dd8e5fc696a534291b09be0c18529ee3a7656886970ff60d65cd5fe6f3fd3bb3cd4f34237648b4fbd780482ec1b6bf496d806b8e0cd31334f33f59248f4
+AUX grc-1.9-configure.patch 1132 BLAKE2B ba7453be971fc34f5ed950415327a8192b539fad53e73012659feb4f10ddfa1b7562e76ad6c736bc9bb23ce78dc29e1080c90735529d08fbdaa050653c03673e SHA512 ddbda30c650418a6900f072aa45dc45b2162d9c20c94dcef212b44e0a7f70d169f8eccd2200ca60b4be711b2e367ad5e8e2fa7f9ed4d041b34387370ac872d17
+AUX grc-1.9-domain-match.patch 613 BLAKE2B b61bdcab166d180051e18e7ce26553faf809e7cbcbfe3a5241e322f0ba5b1f5e0743a9341d678bc5c6b418acf845f55c54da58d57bb2f42e96d20db975cc97f1 SHA512 1427c000d0401abc7dff052759c07cdc460c11ee10acb2994c414f269a94ef209ce1aa20a1717f2be7e95af9f2d1bd16ed0303906a135cb1c8fcbaa54c0558c0
+AUX grc-1.9-python3.patch 1124 BLAKE2B 2f7f6348aa9199124ee01763b1bfde93bbe69a5a441161df468230c4c09a869ea2c0725b560bdcf57d83fc7b47941e3bff6fcda72eadd327bac563a09b396d14 SHA512 275f45634f7d15eea8c359cf5850421ac0b057da987f053717da5ef15b82e4613051ab12f84e78ee809e71bd55382532b73d3731cdf4a10421c2e7622a236a3a
+DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
+DIST grc-1.9.tar.gz 29252 BLAKE2B f74c44e7166ba9dae7ccd90ef241c01d56cf860001dca81873c0078c1702c780dd49ce7ed03774a36aa1e4564d39f2a90932aadb8b20d8ed2f0741aae831d154 SHA512 947f4b61a8d4061e99d64e25a7b5ca2bcd042580b537ea07ea6ca609d7b81b1976b301de6036be2c199c7fa25c3f32d41a887f811ad72a1a18dd63d284e61050
+DIST grc_1.5.tar.gz 26363 BLAKE2B a4345b509581141b4fa8aeeaaf3a851b021c9314e2173e3a5485105f20182a2ecff8d0829537b24d1c972520cc78837d8050f7e9e0a6e615789b227ec964ccc3 SHA512 6b95a8db5df0d99b49052deb086ac02b180810ce754c744e145e3e0508562fb632e7fdb38ec4ad039f6e998c4122b065ba53925d73268c589475e36c16aa68d7
+EBUILD grc-1.11-r1.ebuild 1380 BLAKE2B f917b77202d0f9062fa92401cdbef4fbcf212784c16c9544ac1c60e363999afe903fbb43ddec44cd0a6a330d1d7b07543fe2b3423924b2c157d8ebea559ce8a4 SHA512 84c284607ff821ca46f058df24a9eda3f0d0fc10984aae05f05d5918f6d5f1b6918c5df616bbcc9b04bd898349496fdd73fb1f1c79590bcc021b23666d6532e0
+EBUILD grc-1.5.ebuild 902 BLAKE2B 9e822a2eb28b034ed4e4cb4497de4991446e69042f3879c416d803b1131120b05f6caa8c7cd3a4c6350ab20705df60d90d73e045ac944e26425b62a708f3b035 SHA512 e144282e3bfe98e19c203144308da05f3478dfd1e55027d5479d76a889dd1d7bda0dbb77640b45431b6cf5e466a8ce72ae9823bf6c35cb524851dc90aeab2f6b
+EBUILD grc-1.9.ebuild 1300 BLAKE2B 7f6a448b961f887cdf0231968b28e569f9fefafd2544efc10aa538d3758c2ef2bc333bfed6c5cb70dbd02f97a22046af6835dab9814114eba56d57e354cf970c SHA512 598ea4d295763dcb49e9b22528a372e9874a21c6fa4dc4ab69754326942773e83c53fd8d4314d60068b4c7102a4e15eeb75dbfb1abe3d32d54a06f5e51159080
+MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/files/conf.configure b/app-misc/grc/files/conf.configure
new file mode 100644
index 000000000000..8f26c601eba8
--- /dev/null
+++ b/app-misc/grc/files/conf.configure
@@ -0,0 +1,27 @@
+# cache functions
+regexp=\b(loading|updating|creating) cache\b
+colours=yellow bold
+.........
+# checking
+regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
+colours=yellow
+.........
+# result is complex
+regexp=\.\.\. .*$
+colours=cyan
+.........
+# check succeeded
+regexp=\.\.\.( \(cached\))? yes$
+colours=blue bold
+.........
+# check did not succeed
+regexp=\.\.\.( \(cached\))? no$
+colours=magenta
+.........
+# ... should be normal
+regexp=\.\.\.
+colours=default
+.........
+# creating stuff
+regexp=\bcreating\b
+colours=green
diff --git a/app-misc/grc/files/grc-1.4-ipv6.patch b/app-misc/grc/files/grc-1.4-ipv6.patch
new file mode 100644
index 000000000000..81945ea42618
--- /dev/null
+++ b/app-misc/grc/files/grc-1.4-ipv6.patch
@@ -0,0 +1,16 @@
+ conf.netstat | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf.netstat b/conf.netstat
+index 2dd96e3..ec2779b 100644
+--- a/conf.netstat
++++ b/conf.netstat
+@@ -19,7 +19,7 @@ regexp=^IPX.*[\dABCDEF]+:[\dABCDEF]+
+ colours=green
+ =======
+ # protocols
+-regexp=(^tcp|^udp|^unix|^IPX|STREAM|DGRAM)
++regexp=(^tcp6|^tcp|^udp6|^udp|^unix|^IPX|STREAM|DGRAM)
+ colours=bold blue
+ =======
+ # status
diff --git a/app-misc/grc/files/grc-1.4-support-more-files.patch b/app-misc/grc/files/grc-1.4-support-more-files.patch
new file mode 100644
index 000000000000..d90fe86bb16f
--- /dev/null
+++ b/app-misc/grc/files/grc-1.4-support-more-files.patch
@@ -0,0 +1,53 @@
+--- grc-1.4.orig/conf.gcc
++++ grc-1.4/conf.gcc
+@@ -1,7 +1,7 @@
+ #
+-regexp=\bgcc\b
+-colours=yellow
+-count=more
++regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
++colours=white bold
++count=once
+ .........
+ #
+ regexp=^[^:\s]*?:\d+:
+@@ -15,6 +15,10 @@
+ regexp=\`[A-Za-z0-9_():&*]+( const)?\'
+ colours=magenta
+ .........
++# compilation method modifiers
++regexp=\s\-(O\d?|f\S+|pthread|g\S*|c|W\S,\S+)\b
++colours=yellow
++.........
+ # -O
+ regexp=\-O\d
+ colours=green
+@@ -27,7 +31,7 @@
+ # stderr to grcat
+ #
+ # warning
+-regexp=warning:.*
++regexp=[Ww]arning[:\b]
+ colours=white
+ .........
+ regexp=warning:
+@@ -35,7 +39,7 @@
+ count=once
+ .........
+ # error
+-regexp=error:.*
++regexp=[Ee]rror[:\b]
+ colours=bold white
+ .........
+ regexp=error:
+--- grc-1.4.orig/grc.conf
++++ grc-1.4/grc.conf
+@@ -19,7 +19,7 @@
+ conf.traceroute
+
+ # gcc command
+-(^|[/\w\.]+/)g?cc\s
++(^|[/\w\.]+/)(g?cc|[gc]\+\+)\s
+ conf.gcc
+
+ # make command
diff --git a/app-misc/grc/files/grc-1.9-bash.patch b/app-misc/grc/files/grc-1.9-bash.patch
new file mode 100644
index 000000000000..5e1dcda299ee
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-bash.patch
@@ -0,0 +1,26 @@
+From 1d4f9e1ca5a27426da4dcbd3caee1e38b5d272aa Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 27 Dec 2016 13:17:27 +0000
+Subject: [PATCH] Use bash internal functionalities for grc detection
+
+which is an external tool, where as type is a bash internal funciton
+and always available
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ grc.bashrc | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/grc.bashrc b/grc.bashrc
+index e9eba08..54e570d 100644
+--- a/grc.bashrc
++++ b/grc.bashrc
+@@ -1,6 +1,5 @@
+-GRC=`which grc`
+-if [ "$TERM" != dumb ] && [ -n "$GRC" ]
+-then
++GRC="$(type -p grc)"
++if [ "$TERM" != dumb ] && [ -n "$GRC" ]; then
+ alias colourify="$GRC -es --colour=auto"
+ alias configure='colourify ./configure'
+ alias diff='colourify diff'
diff --git a/app-misc/grc/files/grc-1.9-configure.patch b/app-misc/grc/files/grc-1.9-configure.patch
new file mode 100644
index 000000000000..66dc4ceda80d
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-configure.patch
@@ -0,0 +1,46 @@
+From 6d7ab5f6486c6d30a685605aa5b0ecfda0434e86 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 27 Dec 2016 17:32:48 +0000
+Subject: [PATCH] More advanced regex for configure colouring
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ conf.configure | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/conf.configure b/conf.configure
+index ac88ec7..e7b5d89 100644
+--- a/conf.configure
++++ b/conf.configure
+@@ -1,14 +1,27 @@
+-regexp=^checking
++# cache functions
++regexp=\b(loading|updating|creating) cache\b
++colours=yellow bold
++.........
++# checking
++regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
+ colours=bold blue
+ .........
++# result is complex
+ regexp=\.\.\. .*$
+ colours=bold yellow
+ .........
+-regexp=\.\.\. yes$
++# check succeeded
++regexp=\.\.\.( \(cached\))? yes$
+ colours=bold cyan
+ .........
+-regexp=\.\.\. no$
++# check did not succeed
++regexp=\.\.\.( \(cached\))? no$
+ colours=bold red
+ .........
+-regexp=\.\.\.[ ]
++# ... should be normal
++regexp=\.\.\.
+ colours=default
++.........
++# creating stuff
++regexp=\bcreating\b
++colours=green
diff --git a/app-misc/grc/files/grc-1.9-domain-match.patch b/app-misc/grc/files/grc-1.9-domain-match.patch
new file mode 100644
index 000000000000..f00fecd7c67a
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-domain-match.patch
@@ -0,0 +1,22 @@
+From 2e422109af7094d2787660f7841e7c2ab10bbcc8 Mon Sep 17 00:00:00 2001
+From: Pavel Vishnyakov <djhumster@gmail.com>
+Date: Thu, 17 Dec 2015 18:00:37 +0300
+Subject: [PATCH] Update conf.traceroute
+
+More correct way to match domains with any length.
+Can be checked her https://regex101.com/r/dI3jQ3/1
+---
+ conf.traceroute | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf.traceroute b/conf.traceroute
+index b6501a2..983a7cd 100644
+--- a/conf.traceroute
++++ b/conf.traceroute
+@@ -1,5 +1,5 @@
+ # hostname
+-regexp=\s\w+[\w\-\.]+\w+
++regexp=\w+[\w\-\.]+\.[a-z]+
+ colours=bold yellow
+ count=once
+ -
diff --git a/app-misc/grc/files/grc-1.9-python3.patch b/app-misc/grc/files/grc-1.9-python3.patch
new file mode 100644
index 000000000000..9f4db14a2eec
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-python3.patch
@@ -0,0 +1,41 @@
+ grc | 2 ++
+ grcat | 8 +++-----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/grc b/grc
+index 56a53b4..19afe7c 100755
+--- a/grc
++++ b/grc
+@@ -1,5 +1,7 @@
+ #! /usr/bin/python
+
++from __future__ import print_function
++
+ import os, re, string, sys, getopt, signal
+
+ def version():
+diff --git a/grcat b/grcat
+index a4e6dd9..16586e2 100755
+--- a/grcat
++++ b/grcat
+@@ -1,5 +1,7 @@
+ #! /usr/bin/python
+
++from __future__ import print_function
++
+ import sys, os, string, re, signal, errno
+
+ #some default definitions
+@@ -140,11 +142,7 @@ while not is_last:
+ # do not try to understand the optimized form below :-)
+ if 'colours' in ll:
+ colstrings = list(
+- map(
+- lambda colgroup:
+- ''.join(map(lambda x: get_colour(x), split(colgroup))),
+- split(ll['colours'], ',')
+- )
++ [''.join([get_colour(x) for x in split(colgroup)]) for colgroup in split(ll['colours'], ',')]
+ )
+ ll['colours'] = colstrings
+
diff --git a/app-misc/grc/grc-1.11-r1.ebuild b/app-misc/grc/grc-1.11-r1.ebuild
new file mode 100644
index 000000000000..516d79b6b948
--- /dev/null
+++ b/app-misc/grc/grc-1.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed \
+ -e 's:#! :#!:g' \
+ -e 's:3$::g' \
+ -i grc grcat || die
+ default
+}
+
+src_install() {
+ python_foreach_impl python_doscript grc grcat
+
+ insinto /usr/share/grc
+ doins \
+ contrib/mrsmith/conf.* \
+ colourfiles/conf.* \
+ grc.bashrc \
+ grc.fish \
+ grc.zsh
+
+ insinto /etc
+ doins grc.conf
+
+ dodoc README.markdown INSTALL TODO debian/changelog CREDITS Regexp.txt
+ doman *.1
+}
+
+pkg_postinst() {
+ elog
+ elog "Shell specific configurations can be found in ${ROOT}usr/share/grc"
+ elog "Be sure to symlink one to use grc globally:"
+ elog
+ elog " ln -s ${ROOT}usr/share/grc.SHELL ${ROOT}etc/profile.d/grc.sh"
+ elog
+ elog "Replace 'SHELL' in the above command with one of: bashrc, fish, zsh."
+ elog "Afterwards, use '. ${ROOT}etc/profile' to activate grc in existing"
+ elog "shell sessions."
+ elog
+}
diff --git a/app-misc/grc/grc-1.5.ebuild b/app-misc/grc/grc-1.5.ebuild
new file mode 100644
index 000000000000..b20233047ba5
--- /dev/null
+++ b/app-misc/grc/grc-1.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.4-support-more-files.patch \
+ "${FILESDIR}"/${PN}-1.4-ipv6.patch
+}
+
+src_install() {
+ python_foreach_impl python_doscript grc grcat
+
+ insinto /usr/share/grc
+ doins conf.* "${FILESDIR}"/conf.*
+
+ insinto /etc
+ doins grc.conf
+
+ dodoc README INSTALL TODO debian/changelog CREDITS
+ doman grc.1 grcat.1
+}
diff --git a/app-misc/grc/grc-1.9.ebuild b/app-misc/grc/grc-1.9.ebuild
new file mode 100644
index 000000000000..8a0b5413f882
--- /dev/null
+++ b/app-misc/grc/grc-1.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # https://github.com/garabik/grc/pull/44
+ "${FILESDIR}"/${PN}-1.4-support-more-files.patch
+ # https://github.com/garabik/grc/pull/43
+ "${FILESDIR}"/${PN}-1.4-ipv6.patch
+ # https://github.com/garabik/grc/pull/9
+ "${FILESDIR}"/${P}-domain-match.patch
+ # https://github.com/garabik/grc/pull/45
+ "${FILESDIR}"/${P}-python3.patch
+ # https://github.com/garabik/grc/pull/46
+ "${FILESDIR}"/${P}-bash.patch
+ # https://github.com/garabik/grc/pull/47
+ "${FILESDIR}"/${P}-configure.patch
+)
+
+src_install() {
+ python_foreach_impl python_doscript grc grcat
+
+ insinto /usr/share/grc
+ doins \
+ mrsmith/conf.* \
+ conf.* \
+ grc.bashrc
+
+ insinto /etc
+ doins grc.conf
+
+ dodoc README INSTALL TODO debian/changelog CREDITS Regexp.txt
+ doman *.1
+}
diff --git a/app-misc/grc/metadata.xml b/app-misc/grc/metadata.xml
new file mode 100644
index 000000000000..d65cd2e407ea
--- /dev/null
+++ b/app-misc/grc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">garabik/grc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/gtk-sunlight-0.4.2 b/app-misc/gtk-sunlight-0.4.2
deleted file mode 100644
index 7e7eddd68c2f..000000000000
--- a/app-misc/gtk-sunlight-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Real-time Sunlight Wallpaper
-EAPI=4
-HOMEPAGE=http://realtimesunlightwallpaper.weebly.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://ppa.launchpad.net/realtime.sunlight.wallpaper/rsw/ubuntu/pool/main/g/gtk-sunlight/gtk-sunlight_0.4.2.orig.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e453d695c63f02ce357d0954870af981
diff --git a/app-misc/gtk-sunlight/Manifest b/app-misc/gtk-sunlight/Manifest
new file mode 100644
index 000000000000..e842d05d2299
--- /dev/null
+++ b/app-misc/gtk-sunlight/Manifest
@@ -0,0 +1,3 @@
+DIST gtk-sunlight_0.4.2.orig.tar.gz 562581 BLAKE2B 6fd80fd0324de2e7fbe5cf72eddecee128abe4d4d4cb13c30c224241f1fb99a8683bce43f2b60dc309ac9479f424bd31db5a5c2c659a36da0266b3fc58cd687c SHA512 6490172beeb4c3566a42de858e321cdf83be6852d5c290f75f41d22855d002e8609948164cb757e787a1123a4fe47b69272996ffc821c057b7c6ce8b0b180083
+EBUILD gtk-sunlight-0.4.2.ebuild 561 BLAKE2B c52c7f3c048717138b6c815d16be2a6329ace22a53d6a71468bf6847e5f15b64d0c9f93c44edfc1f7ae50ee18cabb810a98a37b8daf26660aeee5a08d9cff92f SHA512 22429b40240fcb211927e87408c5335a0731e5381c472d68ca3528113c3d121feae7c456b1419cf3479a99b407461df7eb30d6a67f2ad6eb423155b6bea116f9
+MISC metadata.xml 239 BLAKE2B d243069880f9225abf8b77145dd8c9edbc49f9cd3ce91b8995f16aec20c74534c9e8941a0886c01ee4a2cac5dea72653b8be1b08033252e9f81a76ca9b78bc32 SHA512 be29819db58c3ddb7212a488f9965de11cb5d84223ccae9458e968425296d3ef0f93f20edf7b4ab8a4dda6c166c4104c8b615c82feac5d87b3364a88de591a45
diff --git a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
new file mode 100644
index 000000000000..cc518cf235df
--- /dev/null
+++ b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Real-time Sunlight Wallpaper"
+HOMEPAGE="http://realtimesunlightwallpaper.weebly.com/"
+SRC_URI="https://ppa.launchpad.net/realtime.sunlight.wallpaper/rsw/ubuntu/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3"
+DEPEND="${REPEND}
+ virtual/pkgconfig"
+
+src_compile() {
+ tc-export CC
+ default
+}
diff --git a/app-misc/gtk-sunlight/metadata.xml b/app-misc/gtk-sunlight/metadata.xml
new file mode 100644
index 000000000000..d04de4894ede
--- /dev/null
+++ b/app-misc/gtk-sunlight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/gtypist-2.9.5 b/app-misc/gtypist-2.9.5
deleted file mode 100644
index 708709bfe563..000000000000
--- a/app-misc/gtypist-2.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( virtual/emacs ) xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
-DESCRIPTION=Universal typing tutor
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gtypist/
-IUSE=nls emacs xemacs
-KEYWORDS=amd64 ppc x86 ~amd64-linux
-LICENSE=GPL-2 public-domain
-RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( virtual/emacs ) xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
-SLOT=0
-SRC_URI=mirror://gnu/gtypist/gtypist-2.9.5.tar.xz http://colemak.com/pub/learn/colemak.typ
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79e2c7fae136476d7e8179c83db792e7
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
new file mode 100644
index 000000000000..a3c3c48644d6
--- /dev/null
+++ b/app-misc/gtypist/Manifest
@@ -0,0 +1,6 @@
+AUX 50gtypist-gentoo.el 182 BLAKE2B ae05de070f7c0dd0e0c6b31a4d9a8e9bab1b0f3d6a3faec0766207c7a9ae3ced0014eb13ee732f8d1ca807e0f72d8ddeb3a31e206e6c60d13d485844835ecc83 SHA512 1dd01580d11482f47899b0e3623c61d318d0bc4630851e5a4ee61ea008159db3372a144d68045394332c9a7ae3877e558502cf24c927a3d19a4e60aa046d12a5
+AUX gtypist-2.8.3-xemacs-compat.patch 592 BLAKE2B 23d8195c23c0e510b42c5b4ef9b466cfe13fc094990502615e49b28d97630758f4f7ba6f78dc84c941c2b481547eba423c96156cb909ed5fcb4bf1cd06404777 SHA512 6e85193a1354bc318f78382aaa24dea473d704ec347f8ae854b4a83985f2d4b1b8f64e59e3526b05bdd1e264de8fb8d4d6865bb296cf55f3896a56bfdc0930fb
+DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
+DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
+EBUILD gtypist-2.9.5.ebuild 1428 BLAKE2B 7d90949787de377bc61f4bca139b2af740de5260c0870331139a3cd7bef03daf5cb5abe4ad5b90ef85a10500a884f70624cb8ddbceb52411cf23a07cf6348c46 SHA512 c118f5a72fbe318220e963fff828a03013432fb79327e6fc39ec5a5492137eb984c4e2d3d4f6785aa65cfc8e4e137f5094a082f6344d0dd45cb69076b4665329
+MISC metadata.xml 246 BLAKE2B 0bfcc7ff5b18e4794606074e7cfd25cdb14e1324dc50880490257fb94ade836ed7d04dc043fa026732c6eb4eeea9daf2b5e0112489c9fdb5959f718ec9e4839c SHA512 868f217ab39861a74e1e85a7920bb2c283cca35d231d4cd2c8e66a6d9ad81d5b03343701fd508ba13bc7c273e4d34678954005d2f58cbb147beb01ad3b7197ee
diff --git a/app-misc/gtypist/files/50gtypist-gentoo.el b/app-misc/gtypist/files/50gtypist-gentoo.el
new file mode 100644
index 000000000000..8d888d4dcd87
--- /dev/null
+++ b/app-misc/gtypist/files/50gtypist-gentoo.el
@@ -0,0 +1,6 @@
+
+;; gtypist site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'gtypist-mode "gtypist-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.typ\\'" . gtypist-mode))
diff --git a/app-misc/gtypist/files/gtypist-2.8.3-xemacs-compat.patch b/app-misc/gtypist/files/gtypist-2.8.3-xemacs-compat.patch
new file mode 100644
index 000000000000..166a82c48263
--- /dev/null
+++ b/app-misc/gtypist/files/gtypist-2.8.3-xemacs-compat.patch
@@ -0,0 +1,18 @@
+--- gtypist-2.8.3-orig/tools/gtypist-mode.el 2003-09-28 23:35:22.000000000 +0200
++++ gtypist-2.8.3/tools/gtypist-mode.el 2007-04-21 14:49:16.000000000 +0200
+@@ -95,7 +95,14 @@
+
+ (require 'font-lock)
+ (require 'thingatpt)
+-(require 'executable) ;; executable-find
++
++(eval-and-compile
++ (cond
++ ((fboundp 'executable-find))
++ ((fboundp 'locate-file)
++ (defun executable-find (command)
++ (locate-file command exec-path nil 'executable)))
++ (t (require 'executable))))
+
+ (defvar gtypist-mode-syntax-table nil "Syntax-table for gtypist-mode.")
+ (unless gtypist-mode-syntax-table
diff --git a/app-misc/gtypist/gtypist-2.9.5.ebuild b/app-misc/gtypist/gtypist-2.9.5.ebuild
new file mode 100644
index 000000000000..f15364a27288
--- /dev/null
+++ b/app-misc/gtypist/gtypist-2.9.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils elisp-common
+
+DESCRIPTION="Universal typing tutor"
+HOMEPAGE="https://www.gnu.org/software/gtypist/"
+SRC_URI="mirror://gnu/gtypist/${P}.tar.xz
+ http://colemak.com/pub/learn/colemak.typ"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
+IUSE="nls emacs xemacs"
+
+DEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ emacs? ( virtual/emacs )
+ xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+ unpack ${P}.tar.xz
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.8.3-xemacs-compat.patch
+}
+
+src_configure() {
+ local lispdir=""
+ if use emacs; then
+ lispdir="${SITELISP}/${PN}"
+ einfo "Configuring to build with GNU Emacs support"
+ elif use xemacs; then
+ lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/lisp/${PN}"
+ einfo "Configuring to build with XEmacs support"
+ fi
+
+ econf \
+ $(use_enable nls) \
+ EMACS=$(usev emacs || usev xemacs || echo no) \
+ --with-lispdir="${lispdir}"
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_install() {
+ default
+
+ insinto /usr/share/gtypist
+ doins "${DISTDIR}"/colemak.typ
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
new file mode 100644
index 000000000000..df96eb34a05f
--- /dev/null
+++ b/app-misc/gtypist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dabbott@gentoo.org</email>
+ <name>David Abbott</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/hachoir-metadata-1.3.3-r1 b/app-misc/hachoir-metadata-1.3.3-r1
deleted file mode 100644
index 993bed31892c..000000000000
--- a/app-misc/hachoir-metadata-1.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Program to extract metadata using Hachoir library
-EAPI=5
-HOMEPAGE=https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata/
-IUSE=gnome gtk python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hachoir-metadata/hachoir-metadata-1.3.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=62a8904126acf3ec7527923c968e4991
diff --git a/app-misc/hachoir-metadata/Manifest b/app-misc/hachoir-metadata/Manifest
new file mode 100644
index 000000000000..e5e45635a7b6
--- /dev/null
+++ b/app-misc/hachoir-metadata/Manifest
@@ -0,0 +1,3 @@
+DIST hachoir-metadata-1.3.3.tar.gz 52304 BLAKE2B 31da89c0ca95c381fef3354a56f45569ca0f69e8e14518e1e83897dccd5be8a77d8636127f3363f9b28998e39dfccf0d008af00f0c1e49257fe95012aa2c738e SHA512 f0958e1bb6fbeca56caa31a8574da2f64df969cdb9de80e733b36dfae0e07c8f0fbecc53f801a359f7d16ac1a3b3e0605b7c6a3bd6da3c09a3cf2c971bf8750a
+EBUILD hachoir-metadata-1.3.3-r1.ebuild 1462 BLAKE2B a73ee92ce3fbf079575f92ba5373083b029baa513709b5407228f43f1930fb7cfeee8f4d6b58e8b2dcfa4cb48bfdb723895b963ddd35f19696d5617e36377ccb SHA512 c5dd6042b374a9850a7875e82b74bbe6a629b6800babd730a00a7017800b4fe80376e1e8ab7edab976b0402f77138ae45a5c5069da42548507ce2633a85d7bb7
+MISC metadata.xml 428 BLAKE2B e53b795402d41bbf42f54ec1745cfa0d238a7e185d8db0fc06fdfb5faec4d6d72c6b395003f365cd8a33750ec35b7b0c62753dcc0fc949934d5de457a6b254a2 SHA512 c76d6bc6b172d7329562c87557d9695e5629a3ceafcc126f663b5af51af7f728a6f64dd875832af4acb2057ac63d23dc71526724a61395c3e34303da4177acd7
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..2f0d75855806
--- /dev/null
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to extract metadata using Hachoir library"
+HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="gnome gtk"
+
+RDEPEND="
+ >=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]
+ >=dev-python/hachoir-parser-1.3[${PYTHON_USEDEP}]
+ gtk? ( >=dev-python/pygtk-2.0[${PYTHON_USEDEP}] )
+ gnome? ( gnome-base/nautilus gnome-extra/zenity )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ if ! use gtk; then
+ sed -i -e '/SCRIPTS/s:, "hachoir-metadata-gtk"::' setup.py || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ mydistutilsargs=( --setuptools --disable-qt )
+}
+
+python_test() {
+ "${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if use gnome; then
+ exeinto /usr/share/nautilus-scripts
+ doexe gnome/hachoir
+ fi
+}
+
+pkg_postinst() {
+ if use gnome; then
+ elog "To enable the nautilus script, symlink it with:"
+ elog " $ mkdir -p ~/.gnome2/nautilus-scripts"
+ elog " $ ln -s /usr/share/nautilus-scripts/hachoir ~/.gnome2/nautilus-script"
+ fi
+}
diff --git a/app-misc/hachoir-metadata/metadata.xml b/app-misc/hachoir-metadata/metadata.xml
new file mode 100644
index 000000000000..21dca811f4cb
--- /dev/null
+++ b/app-misc/hachoir-metadata/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">tool to extract metadata from multimedia files (sound, video, archives,
+ etc.)</longdescription>
+ <upstream>
+ <remote-id type="pypi">hachoir-metadata</remote-id>
+ <remote-id type="bitbucket">haypo/hachoir</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/hachoir-subfile-0.5.3-r1 b/app-misc/hachoir-subfile-0.5.3-r1
deleted file mode 100644
index 67db965cbed4..000000000000
--- a/app-misc/hachoir-subfile-0.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hachoir-core-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-regex-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Find subfile in any binary stream
-EAPI=5
-HOMEPAGE=https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/hachoir-core-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-regex-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hachoir-subfile/hachoir-subfile-0.5.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0eb94add3ca8ce68b2d7276c68eeab6
diff --git a/app-misc/hachoir-subfile/Manifest b/app-misc/hachoir-subfile/Manifest
new file mode 100644
index 000000000000..b108fb2491e9
--- /dev/null
+++ b/app-misc/hachoir-subfile/Manifest
@@ -0,0 +1,3 @@
+DIST hachoir-subfile-0.5.3.tar.gz 15499 BLAKE2B a055f19285cdfa5a6d31b9f7a346b7ab54b8eb3c54d78890079bde25bf9660b5cadd18f9418b4dc55a543b329bbf38f274aa78fccddf52f47f9f65f28a0d4375 SHA512 b34cf7d7befc1031ae821dc5124b83d198cbd6d2f95666b8497b23a87c748d574637ed65023c7e1e2532a3a62ca079dfd13d11dbcac31457c6423309208d0ce4
+EBUILD hachoir-subfile-0.5.3-r1.ebuild 770 BLAKE2B 26d1ff2aed81b2957a51b8af0101618b81122878cc27d55eeda196238387037703f7bbafb34b355df88a1f7bbef212e3f13da471e0162434ca0dec37b20c96e6 SHA512 2a8f9c56de9d39584ec23cb5204c83454604a6c4e1a2e57f634d2404268e838117125aa8969561476270b0138c3f274689942635376200ab62166496cd18ccc4
+MISC metadata.xml 425 BLAKE2B 6636365b918a8252757c0a69ea4dad61a9ea1eefe45ad2b0864b33a72e41c9af358662550bb9e9bdb42c88d3c627d9c316192f45d78761bfc5ecab7c76e00cb9 SHA512 7c19037ce6003a18113d0ef240041a0ad9501080b5021a018124be678ee86240f6ad3cbb4fa0ece3a8a4994884eb499374f714b2ab2dd1e60ce82e885051af2d
diff --git a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..b2b40be21fef
--- /dev/null
+++ b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Find subfile in any binary stream"
+HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/hachoir-core-1.1[${PYTHON_USEDEP}]
+ >=dev-python/hachoir-parser-1.1[${PYTHON_USEDEP}]
+ >=dev-python/hachoir-regex-1.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+ mydistutilsargs=(
+ --setuptools
+ )
+}
diff --git a/app-misc/hachoir-subfile/metadata.xml b/app-misc/hachoir-subfile/metadata.xml
new file mode 100644
index 000000000000..6fc0267d511b
--- /dev/null
+++ b/app-misc/hachoir-subfile/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">a tool based on hachoir-parser to find subfiles in any binary stream.</longdescription>
+ <upstream>
+ <remote-id type="pypi">hachoir-subfile</remote-id>
+ <remote-id type="bitbucket">haypo/hachoir</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/hachoir-urwid-1.1-r1 b/app-misc/hachoir-urwid-1.1-r1
deleted file mode 100644
index c424bd713265..000000000000
--- a/app-misc/hachoir-urwid-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hachoir-core-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Binary file explorer using Hachoir and urwid libraries
-EAPI=5
-HOMEPAGE=https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/hachoir-core-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hachoir-urwid/hachoir-urwid-1.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8bfed100e5d821019750a8c83485ac12
diff --git a/app-misc/hachoir-urwid/Manifest b/app-misc/hachoir-urwid/Manifest
new file mode 100644
index 000000000000..cf8ba210fe5d
--- /dev/null
+++ b/app-misc/hachoir-urwid/Manifest
@@ -0,0 +1,3 @@
+DIST hachoir-urwid-1.1.tar.gz 17845 BLAKE2B 09262c5faa41e15f160ba30c5813578fcc30fe9f620e287421199345f21c5d912e7d70c00e1753719d011c5cc9d788f1d70cc1bcb45df822da5c175ebb7c1fd7 SHA512 e434756903e4b3885166b825331921fe9c959247a9bf8bad324aa8e3e2b5f4ce22a1546e38df9ce9a8fcfbbb96c6e6ca4bc42e455e66eeec178d85849b1526b2
+EBUILD hachoir-urwid-1.1-r1.ebuild 799 BLAKE2B e6b8eb26b4cf1988a49040b6486f298d9932ed70fe30eaa8a95575b52f132623c5c4ad3e2600df71f918aec6e71c08f71df27e08ddc2863fd8b1be0939ca744e SHA512 c0e5ff17304f285206fa1bbe45dedb221321096180f1fbd22caae516223ed3364f8bf52e7ac6e4172e66e41483e6a5066b66e62ca0a3972618fa4b9e7cc161fc
+MISC metadata.xml 418 BLAKE2B 3be1c8cb3fcd1d9c72ba300431ba67483a5ac160ec955619678a723b06ddfe14ff53dd53ce4f3604b3ecaec54ed45b9e163bc072818e9b35aa29912787898985 SHA512 7f3f6a1d6b9239aeae423fa3b8e172283c5cac3f05b738c06a17ce699576078b18649c8fbf41f4006d3bb2de2fca9f4b751a9466710539133d314d1e64527349
diff --git a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
new file mode 100644
index 000000000000..4ccb31219c4f
--- /dev/null
+++ b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
+HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/hachoir-core-1.2[${PYTHON_USEDEP}]
+ >=dev-python/hachoir-parser-1.0[${PYTHON_USEDEP}]
+ >=dev-python/urwid-0.9.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+ mydistutilsargs=(
+ --setuptools
+ )
+}
diff --git a/app-misc/hachoir-urwid/metadata.xml b/app-misc/hachoir-urwid/metadata.xml
new file mode 100644
index 000000000000..f0e7f1dca36a
--- /dev/null
+++ b/app-misc/hachoir-urwid/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">user interface based on hachoir-parser to explore a binary file.</longdescription>
+ <upstream>
+ <remote-id type="pypi">hachoir-urwid</remote-id>
+ <remote-id type="bitbucket">haypo/hachoir</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/hatools-2.14 b/app-misc/hatools-2.14
deleted file mode 100644
index de8fbef78ab9..000000000000
--- a/app-misc/hatools-2.14
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=High availability environment tools for shell scripting
-EAPI=4
-HOMEPAGE=http://www.fatalmind.com/software/hatools/
-IUSE=test
-KEYWORDS=~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.fatalmind.com/software/hatools/hatools-2.14.tar.gz
-_md5_=10665cb47cf729056577724332a37262
diff --git a/app-misc/hatools/Manifest b/app-misc/hatools/Manifest
new file mode 100644
index 000000000000..b80e65c4aaba
--- /dev/null
+++ b/app-misc/hatools/Manifest
@@ -0,0 +1,3 @@
+DIST hatools-2.14.tar.gz 156771 BLAKE2B f8838054be4a9f4d197a494b5e27b16833ed2b902c2eaabb1bad1c5dc1bc8b1fbd99fbfb6ec3276934b61256f918f5936b8843d6ddab5920f8436b078736709f SHA512 359b652696b6f56287e336df0a844e3d4df098ee896bb5857e9fec087ccb122a5a94aac01ae4c87e530716dfa373814ec78b415dd76f65d5e60a8274af70755c
+EBUILD hatools-2.14.ebuild 488 BLAKE2B d2c150190d1d7990cc2a0a296ac4e8ce669cf111fad603ffe72d8dba1c91242efeeb72262fac4b6e75dce6f10d762c04aa4162cce1e9881707856c7bd68582f0 SHA512 f67cdd263527f2823a0f99ff7bbfbb0936b30a4714c582d4802b313ff731bc3a2ef0b4980324c84aa23c44f3d343a37d21c7c55885d58edbae8d3c121ad880da
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/hatools/hatools-2.14.ebuild b/app-misc/hatools/hatools-2.14.ebuild
new file mode 100644
index 000000000000..4f02f52b8445
--- /dev/null
+++ b/app-misc/hatools/hatools-2.14.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="High availability environment tools for shell scripting"
+HOMEPAGE="http://www.fatalmind.com/software/hatools/"
+SRC_URI="http://www.fatalmind.com/software/hatools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+src_prepare() {
+ sed 's:ksh:bash:g' -i test.sh || die
+}
diff --git a/app-misc/hatools/metadata.xml b/app-misc/hatools/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/hatools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/hddled-0.3 b/app-misc/hddled-0.3
deleted file mode 100644
index 5a44ad621df1..000000000000
--- a/app-misc/hddled-0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=X? ( x11-libs/libX11 )
-DESCRIPTION=Show hard disk activity using the scroll lock LED
-EAPI=5
-HOMEPAGE=http://members.optusnet.com.au/foonly/whirlpool/code/
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=Unlicense
-RDEPEND=X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://gentoo/hddled-0.3.c.xz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fb7ceac616e95c940cef7885743a3bc6
diff --git a/app-misc/hddled/Manifest b/app-misc/hddled/Manifest
new file mode 100644
index 000000000000..68118230a70a
--- /dev/null
+++ b/app-misc/hddled/Manifest
@@ -0,0 +1,3 @@
+DIST hddled-0.3.c.xz 3108 BLAKE2B eb7f2ab61d1969fe0f6ee3a8bebd7346b5cabcbb8a432a9c8c802289dc022efab09e2ca627915c9d2aacaeac8e6519524b9d77d34141850de7693778e825fba8 SHA512 9f535557aff78d3c9693a8d34810a768e8306de73841ba0d0a928a5d205a8a5faf632a9bf51db8763b5d8d2b3de73ee6f06af62f1a0025b0912c7c18133cdf19
+EBUILD hddled-0.3.ebuild 783 BLAKE2B c54c9cea89f996e1b7fc627b3583a985d85451ee485f5fd91ba97bbb3c7546c58f02824326499ce948f28a2c2f74941f5fe9448cdead973ba26ceda3af83018d SHA512 cce593ff9cb8517bd3c3ddec35a5bf195f256eb6965bce307c7843d49a2cc92a3a17581cdcf6184704f2092f84bd42bb1ffe662b55103ba6a7f4a41f15efa6fc
+MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-misc/hddled/hddled-0.3.ebuild b/app-misc/hddled/hddled-0.3.ebuild
new file mode 100644
index 000000000000..7197a4970c71
--- /dev/null
+++ b/app-misc/hddled/hddled-0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Show hard disk activity using the scroll lock LED"
+HOMEPAGE="http://members.optusnet.com.au/foonly/whirlpool/code/"
+SRC_URI="mirror://gentoo/${P}.c.xz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+ unpack ${A}
+ mv ${P}.c ${PN}.c || die
+}
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} -o ${PN} ${PN}.c ${LDFLAGS} || die
+ if use X ; then
+ $(tc-getCC) ${CFLAGS} -DX -lX11 -o x${PN} ${PN}.c ${LDFLAGS} || die
+ fi
+}
+
+src_install() {
+ dobin ${PN} || die
+ if use X ; then
+ dobin x${PN} || die
+ elog "X version was renamed to x${PN}"
+ fi
+}
diff --git a/app-misc/hddled/metadata.xml b/app-misc/hddled/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/app-misc/hddled/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/hello-2.10 b/app-misc/hello-2.10
deleted file mode 100644
index e9c55825df15..000000000000
--- a/app-misc/hello-2.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=GNU "Hello, world" application
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/hello/
-IUSE=nls
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3 GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/hello/hello-2.10.tar.gz
-_md5_=1b2dc791e417a7356b4e09fbe8bbb2c3
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
new file mode 100644
index 000000000000..6dc363b178ac
--- /dev/null
+++ b/app-misc/hello/Manifest
@@ -0,0 +1,3 @@
+DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadfc2b291e2fe3612e73f7eca48b3b63032c883f11a8a5764c757625c4a736904d756d451ad0516578040290f SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de
+EBUILD hello-2.10.ebuild 475 BLAKE2B 61041ddbbf448073cebbaadc8aeb57e2bfba978dc041719a5d4faf9a32f6f68db6e75d1598eacbb8a3838c064f3cdd11462802644a2e2dd7c6b91bf5d4a1cb8f SHA512 2c70757973aebaad59ae5dd1648ddbdda55d1f39567f123fb53fe4a1f1e9f383c3db4aba6537704fe799565c795d60dd32a74d52457f556ecad44779e36c6013
+MISC metadata.xml 247 BLAKE2B 0d7d70e4b64584cfb5104e6f272db8f23e13147f254d8b5c74169b41ffaa33168d3f1b5335792db250ef06758b50220909c21fe336a76c7437662f6a28bfeec1 SHA512 81c81f4438f7102cb9da6c1b43daaae38dd1b111ef072465fa7e8eaba449705fa878f580e9f29dc0f28b77b77d1d9e1e40101f5c88d117727776b21ad62dd1a4
diff --git a/app-misc/hello/hello-2.10.ebuild b/app-misc/hello/hello-2.10.ebuild
new file mode 100644
index 000000000000..c2b5e416b931
--- /dev/null
+++ b/app-misc/hello/hello-2.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="GNU \"Hello, world\" application"
+HOMEPAGE="https://www.gnu.org/software/hello/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
+
+src_configure() {
+ econf $(use_enable nls)
+}
diff --git a/app-misc/hello/metadata.xml b/app-misc/hello/metadata.xml
new file mode 100644
index 000000000000..fa5200558136
--- /dev/null
+++ b/app-misc/hello/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>jcallen@gentoo.org</email>
+ <name>Jonathan Callen</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/hexcompare-1.0.4 b/app-misc/hexcompare-1.0.4
deleted file mode 100644
index 32e64f0786ad..000000000000
--- a/app-misc/hexcompare-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0
-DESCRIPTION=ncurses-based visual comparison of binary files
-EAPI=5
-HOMEPAGE=http://hexcompare.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0
-SLOT=0
-SRC_URI=mirror://sourceforge/hexcompare/hexcompare-1.0.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=719993e90ee5fe97e2212c5331a68914
diff --git a/app-misc/hexcompare/Manifest b/app-misc/hexcompare/Manifest
new file mode 100644
index 000000000000..6d2f17f351ef
--- /dev/null
+++ b/app-misc/hexcompare/Manifest
@@ -0,0 +1,4 @@
+AUX hexcompare-1.0.4-Makefile.patch 445 BLAKE2B 68b34176c976109a2c9b7cc17b88b92f877f2f05784bc726907ae2c28b4923d8f0649fd3fefa987e04c0b996ac2da1ab4789f90162c4eed7b3db3b70add229df SHA512 8f66e5b080d41906ea9301c066a51f5869a7274e29a6a1391ea81d129dfc88682f035c1ab57319199d5e82020fac7e96e2666fec362a5605d562dc5826448a4b
+DIST hexcompare-1.0.4.tar.gz 9686 BLAKE2B 930004101504ec2bce1aaadac03a221e29e4668cf58591292510d3c66effbdd5f91fc405fc4d55d9116ec3ba260c91927371c8768e01ccf4169cb6d955642128 SHA512 847bf7e26f27aa0ff56e38b3fe95ad7940a0226e0c496963530fa405d8a3a50f8288a4c7f28d48d4cce05e52c1f69180917a7f10da0943cabf977f78b62eb5fe
+EBUILD hexcompare-1.0.4.ebuild 533 BLAKE2B d937143767bad3cefbf91c9533bf4411b6202b9372a335e230e2f99070597031fdeaa3051cb0ce460ae97e40bd2c2277e297bf6636e62bcbbc762b5c72deeb7d SHA512 3718883457b7dc577392c254d7d4345aee25c0a56e33051383247a40b01f0da8adccea3ce3802f20398f8362ad5154ab615c76a5456365f3f366ac57d628d181
+MISC metadata.xml 323 BLAKE2B 043e136d1f7ba694b012de967d34b7959235ec42f11149c294320b04845571561178755f523105b030c0fcdec143372fde63abbfe7093d8cdd53aabb790123a9 SHA512 ed9c5371824dbf3b0954b16809a85ef0ad9646c0c6342fefa778450f15e6bb092050e0384c3fc05d1a68b4f4430f2bddc5d9ce09ada00728172c1aa5674d0c25
diff --git a/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch b/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
new file mode 100644
index 000000000000..5ccef2047bc7
--- /dev/null
+++ b/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
@@ -0,0 +1,14 @@
+--- hexcompare-1.0.4/Makefile
++++ hexcompare-1.0.4/Makefile
+@@ -1,9 +1,9 @@
+-CFLAGS = -O3 -Wall -Wextra -pedantic -Wformat-security -std=gnu89
++CFLAGS += -Wall -Wextra -pedantic -Wformat-security -std=gnu89
+
+ all: hexcompare
+
+ hexcompare: main.c gui.c
+- $(CC) $(CFLAGS) -o hexcompare main.c gui.c -lncurses
++ $(CC) $(CFLAGS) `pkg-config --cflags ncurses` -o hexcompare main.c gui.c `pkg-config --libs ncurses`
+
+ clean:
+ rm -f *.o
diff --git a/app-misc/hexcompare/hexcompare-1.0.4.ebuild b/app-misc/hexcompare/hexcompare-1.0.4.ebuild
new file mode 100644
index 000000000000..7b11bccd5ad8
--- /dev/null
+++ b/app-misc/hexcompare/hexcompare-1.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="ncurses-based visual comparison of binary files"
+HOMEPAGE="http://hexcompare.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+ tc-export CC
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README
+}
diff --git a/app-misc/hexcompare/metadata.xml b/app-misc/hexcompare/metadata.xml
new file mode 100644
index 000000000000..fc00942f6391
--- /dev/null
+++ b/app-misc/hexcompare/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">hexcompare</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/hilite-1.5-r1 b/app-misc/hilite-1.5-r1
deleted file mode 100644
index 233bd8c62417..000000000000
--- a/app-misc/hilite-1.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=A utility which highlights stderr text in red
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/hilite
-KEYWORDS=amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/hilite-1.5.c
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=392d57ad1812a71975d40c958039c0e5
diff --git a/app-misc/hilite/Manifest b/app-misc/hilite/Manifest
new file mode 100644
index 000000000000..de0aea7b8eed
--- /dev/null
+++ b/app-misc/hilite/Manifest
@@ -0,0 +1,3 @@
+DIST hilite-1.5.c 2872 BLAKE2B bd6f89863100906a731008cc3c1b0480e3aa655119d73d651f425a2686ab0a861637f5818c671d453ce26fd831251699e6eb3b59d3e5b5938e2e1cb4de19a367 SHA512 571fb962e430d3c9e5494d802f529529a5bd0bf6dd7f398e7c55dd5a8effc568f9153edecf50d2e296b97eb20b2ddaa52c2214b9dd989449aff3b93a0547ad45
+EBUILD hilite-1.5-r1.ebuild 681 BLAKE2B d848208a9e09d10a110a94d91bd53e1ae9bc860783cf384170cebd9f11463057ba89eeb42224e8c535c086b37b65cf09f8ff85d5cd67bcde95c3da8d70c74c97 SHA512 b789ffcadad98af2d6adf30c49553aea634e7d78d9d764721dc666462f6d769a2bb69b22a84228a4024b243889011545cda5078d1296cf75cdbb66cb3fff4ab2
+MISC metadata.xml 341 BLAKE2B 95a2d672cce1e13ac46dfcc1661b556a241aafdaf9afdb2a5a84afd4ccc94bce8edcf5483f5deda7cb62a834be32be1f7a0fed38d26b96159e4477e668201df0 SHA512 792aa66d85af91677e5d075168e80f3c4d21a804047bcae76e685e612d0c57edf61167712639a5d3322d9f4c35d25b04b6ec2b8d1cd2150d396b8b4e95e8fcad
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
new file mode 100644
index 000000000000..0eb05fd3e23d
--- /dev/null
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A utility which highlights stderr text in red"
+HOMEPAGE="https://sourceforge.net/projects/hilite"
+SRC_URI="mirror://gentoo/${P}.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+S="${WORKDIR}"
+
+src_unpack() { :; }
+
+src_prepare() {
+ default
+ cp "${DISTDIR}"/${P}.c "${WORKDIR}"/ || die
+}
+
+src_compile() {
+ ebegin "$(tc-getCC) ${LDFLAGS} ${CFLAGS} -o ${PN} ${P}.c"
+ $(tc-getCC) ${LDFLAGS} ${CFLAGS} -o ${PN} ${P}.c || die
+ eend $?
+}
+
+src_install() {
+ dobin "${PN}"
+}
diff --git a/app-misc/hilite/metadata.xml b/app-misc/hilite/metadata.xml
new file mode 100644
index 000000000000..a5ac400c2125
--- /dev/null
+++ b/app-misc/hilite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">hilite</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/hivex-1.3.14 b/app-misc/hivex-1.3.14
deleted file mode 100644
index 4ee1d587da9c..000000000000
--- a/app-misc/hivex-1.3.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby23? ( ruby? ( dev-ruby/rake[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ruby? ( dev-ruby/rake[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ruby? ( dev-ruby/rake[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ruby? ( virtual/rubygems[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25] ) ) ) dev-lang/perl:=
-DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
-EAPI=6
-HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ruby? ( virtual/rubygems[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ) )
-SLOT=0
-SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.14.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6c671ab8b7f87b253a9eab94d4f1a03c
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
new file mode 100644
index 000000000000..dd72f18c5a65
--- /dev/null
+++ b/app-misc/hivex/Manifest
@@ -0,0 +1,3 @@
+DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
+EBUILD hivex-1.3.14.ebuild 1847 BLAKE2B 2a60983c776c5fb1da55b47a1f4c8194cbda6513068320d03dc2f80dbb1eaa8f57f9f53cca9357b5c15eb594f532faf1452ef502cf0d6ace211fe1b3aa56058c SHA512 5c707cdd6fa4830bcdfabd020a4b09ac976ac8754fd75eb51cf4fef14eb128300f666fbac0bcd1df623dcc71e73eed681a1cfbe0e4ac5a4924b8c5c2974d82a4
+MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
new file mode 100644
index 000000000000..b3217d11ff1e
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+RUBY_OPTIONAL=yes
+
+PYTHON_COMPAT=(python2_7 python3_{4,5,6})
+
+inherit eutils perl-module ruby-ng python-single-r1
+
+DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
+HOMEPAGE="http://libguestfs.org"
+SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ocaml readline +perl python test static-libs ruby"
+
+RDEPEND="
+ virtual/libiconv
+ virtual/libintl
+ dev-libs/libxml2:2
+ ocaml? ( dev-lang/ocaml[ocamlopt]
+ dev-ml/findlib[ocamlopt]
+ )
+ readline? ( sys-libs/readline:0 )
+ perl? ( dev-perl/IO-stringy )
+ ruby? ( $(ruby_implementations_depend) )
+ python? ( ${PYTHON_DEPS} )
+ "
+
+DEPEND="${RDEPEND}
+ perl? (
+ test? ( dev-perl/Pod-Coverage
+ dev-perl/Test-Pod-Coverage )
+ )
+ "
+
+ruby_add_bdepend "ruby? ( dev-ruby/rake
+ virtual/rubygems
+ dev-ruby/rdoc )"
+ruby_add_rdepend "ruby? ( virtual/rubygems )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+DOCS=( README )
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_unpack() {
+ default
+ cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all
+}
+
+src_configure() {
+ ruby-ng_src_configure
+
+ if use perl; then
+ pushd perl
+ perl-module_src_configure
+ popd
+ fi
+
+ local myeconfargs=(
+ $(use_with readline)
+ $(use_enable ocaml)
+ $(use_enable perl)
+ --enable-nls
+ --disable-ruby
+ $(use_enable python)
+ --disable-rpath
+ )
+
+ econf ${myeconfargs[@]}
+}
+
+src_compile() {
+ default
+ ruby-ng_src_compile
+}
+
+src_install() {
+ strip-linguas -i po
+
+ emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
+
+ ruby-ng_src_install
+
+ if use perl; then
+ perl_delete_localpod
+ fi
+}
diff --git a/app-misc/hivex/metadata.xml b/app-misc/hivex/metadata.xml
new file mode 100644
index 000000000000..c5adddd4b3e6
--- /dev/null
+++ b/app-misc/hivex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/i2bits-0.0.2 b/app-misc/i2bits-0.0.2
deleted file mode 100644
index b67e6c31fe73..000000000000
--- a/app-misc/i2bits-0.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Utility to convert hex or dec to binary format
-EAPI=6
-HOMEPAGE=https://bitbucket.org/PascalRD/i2bits/
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=http://unixdev.ru/src/i2bits-0.0.2.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=efd73732bf9152a041b355be33bf2fd9
diff --git a/app-misc/i2bits-0.1.0 b/app-misc/i2bits-0.1.0
deleted file mode 100644
index ec15294b0160..000000000000
--- a/app-misc/i2bits-0.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Utility to convert hex or dec to binary format
-EAPI=6
-HOMEPAGE=https://bitbucket.org/PascalRD/i2bits/
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=http://unixdev.ru/src/i2bits-0.1.0.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60759718d17455fe2c09498e61a5b466
diff --git a/app-misc/i2bits/Manifest b/app-misc/i2bits/Manifest
new file mode 100644
index 000000000000..cb8ded40720e
--- /dev/null
+++ b/app-misc/i2bits/Manifest
@@ -0,0 +1,5 @@
+DIST i2bits-0.0.2.tar.gz 1751 BLAKE2B b8efa931754eaae55935c72d52bbc9441044ee674ce2bc48971e9aede1ad6b731d0d5ddc9a595d5d044b3c13073e4e483b44990186861f95b6a3ef6187e614d8 SHA512 8dfca8513f8ad16ac5d093120d49f5d9d7acfd20cad0883c0533d2927aba0b6d779b1ad4d3575e7a66f0e56ead5f783e90f49208d6cc9c65bcb60c8558f5447c
+DIST i2bits-0.1.0.tar.gz 2649 BLAKE2B 050e7eddadc4e8b4e1da50128b735adbe6fbace35a06709fd2f31db3e8ffb672b3d51eced0ecb9c87c3566d32c9aac7a431c641e53597ee55ae431328dfbee48 SHA512 9f7b2fe8ca66740cae081c3f74f0c5d67d956c8cd2b5f39cb7306e58a8f75d6d5848dd640e7e514638dda6f3d1efe5f292605dc4fddffe5e530bbd5f173a1db9
+EBUILD i2bits-0.0.2.ebuild 479 BLAKE2B 9b372d8a3ed130318dca61514c6e14fe492e939dd1e64a1625c8920a47694516803cb7f4308f07aa4d2679d97000dab1b99b59168fd7988a6ec21f6e0adfc4fa SHA512 73b9eebdf5e7babd2d167940463f0b4096a9c1510b505ad791f73b529d7d61305d96153554f8aae851cd60efe17de6e50a9317f75aa72332c3257290b216d5f1
+EBUILD i2bits-0.1.0.ebuild 343 BLAKE2B 9666545851a35afd5463b7ba2ead0161deb7ec684eb4c59a460365655d248a4eeb282fcd1a2d5ee74a69bd428620d371965335634293c6104016456029e45180 SHA512 2bb51305996bc1875678058f1915bc52772d604f397f9b9d6f27f3f23eeb403204c1cb91eeb18dceef8aa17a27cd1efb2fa68c52e9967453e44a1be16eaaa972
+MISC metadata.xml 334 BLAKE2B 02924a4da850188a7552708c5e13c82b3d8912197d09b8a83678960c3de0e408e9dcd458d8dc18a8ae829e33c1c9b9a7754f6b2a6f8a7bce85b35a3ddbebc1eb SHA512 62b95a5794d247168cf9351ac0d70e9d910416241897ceb6b8203eeaaec82cd0c462333b7559f1cf68a7edbb9660af8892cfa50e6368f24f18a0200d78458e74
diff --git a/app-misc/i2bits/i2bits-0.0.2.ebuild b/app-misc/i2bits/i2bits-0.0.2.ebuild
new file mode 100644
index 000000000000..887db7c9d959
--- /dev/null
+++ b/app-misc/i2bits/i2bits-0.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Utility to convert hex or dec to binary format"
+HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
+SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/app-misc/i2bits/i2bits-0.1.0.ebuild b/app-misc/i2bits/i2bits-0.1.0.ebuild
new file mode 100644
index 000000000000..f4d07dee5b44
--- /dev/null
+++ b/app-misc/i2bits/i2bits-0.1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Utility to convert hex or dec to binary format"
+HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
+SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-misc/i2bits/metadata.xml b/app-misc/i2bits/metadata.xml
new file mode 100644
index 000000000000..82db40d0633d
--- /dev/null
+++ b/app-misc/i2bits/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">PascalRD/i2bits</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/icdiff-1.7.3 b/app-misc/icdiff-1.7.3
deleted file mode 100644
index a400470e5df7..000000000000
--- a/app-misc/icdiff-1.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Colourized diff that supports side-by-side diffing
-EAPI=6
-HOMEPAGE=https://www.jefftk.com/icdiff
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.7.3.tar.gz -> icdiff-1.7.3.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8b8a30ea15e6a381f15a37370950a9e
diff --git a/app-misc/icdiff-1.9.1 b/app-misc/icdiff-1.9.1
deleted file mode 100644
index 1594b60f6fdc..000000000000
--- a/app-misc/icdiff-1.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Colourized diff that supports side-by-side diffing
-EAPI=6
-HOMEPAGE=https://www.jefftk.com/icdiff
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.1.tar.gz -> icdiff-1.9.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a8cf5da6763a6eefbf153c1d5203874
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
new file mode 100644
index 000000000000..b0ce4662ab36
--- /dev/null
+++ b/app-misc/icdiff/Manifest
@@ -0,0 +1,6 @@
+AUX icdiff-1.7.3-dont-check-changelog.patch 546 BLAKE2B 28a4ea2becc7f9fb57a6bbcb648b4c61d0c0911e1df463cf1a566cee3e8916f3cc41f57fc912a05f733d0a73010b05e8d4ec6b2d0235edec4982a43ac2689225 SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0
+DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
+DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
+EBUILD icdiff-1.7.3.ebuild 624 BLAKE2B 5c1c29e71507e180ad94d9b9a5eb57efaaddd1d149e847d08e42dec3434ed316b2d91d05119e37187467db934773f0923233334ab93001cd0615601c4a002fb6 SHA512 b128bb425e20d560a9c7fc6d38010dbe1e7cd0eb39b24bc59418684bcfda3b515f2466dfebb809a6c09cd3a9890976ee9c8e73f5f0b5d7e03119c60235129f38
+EBUILD icdiff-1.9.1.ebuild 555 BLAKE2B 25455ee6e61775f8532794d5d1f5f9b967bf2bec53bcc7dab3122511361a4809d3b12a596c79605f16b536e08993a13d69d0d5bef633294e8cc50fcbc8564c9c SHA512 a17a7cd1edf56ee343eb69f76c29e0413e47ad5ded2eb2af059a09e607ec76613ec86a7b8524881b171dc9741a2a1e1858716361988215057dc9ca376b33497d
+MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
new file mode 100644
index 000000000000..1a9f0c957cd5
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
@@ -0,0 +1,16 @@
+diff --git a/test.sh b/test.sh
+index 264c696..1bb7290 100755
+--- a/test.sh
++++ b/test.sh
+@@ -97,11 +97,6 @@ check_gold gold-67-wf.txt tests/input-{6,7}.txt --cols=80 --whole-file
+ check_gold gold-67-ln.txt tests/input-{6,7}.txt --cols=80 --line-numbers
+ check_gold gold-67-u3.txt tests/input-{6,7}.txt --cols=80 -U 3
+
+-if [ $(./icdiff --version | awk '{print $NF}') != $(head -n 1 ChangeLog) ]; then
+- echo "Version mismatch between ChangeLog and icdiff source."
+- fail
+-fi
+-
+ if ! $REGOLD; then
+ echo PASS
+ fi
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
new file mode 100644
index 000000000000..c1f6ccba26d9
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7.3-dont-check-changelog.patch"
+)
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+ ./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
new file mode 100644
index 000000000000..ba4846bf4425
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+ ./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}
diff --git a/app-misc/icdiff/metadata.xml b/app-misc/icdiff/metadata.xml
new file mode 100644
index 000000000000..392b1b8c731f
--- /dev/null
+++ b/app-misc/icdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jeffkaufman/icdiff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ifp-line-0.3 b/app-misc/ifp-line-0.3
deleted file mode 100644
index 3a1ab143bb38..000000000000
--- a/app-misc/ifp-line-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/libusb:0
-DESCRIPTION=iRiver iFP open-source driver
-EAPI=6
-HOMEPAGE=http://ifp-driver.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0
-SLOT=0
-SRC_URI=mirror://sourceforge/ifp-driver/ifp-line-0.3.tar.gz
-_md5_=06b20f66d1d886f92f35d9a919f8bc70
diff --git a/app-misc/ifp-line/Manifest b/app-misc/ifp-line/Manifest
new file mode 100644
index 000000000000..27009e440a7e
--- /dev/null
+++ b/app-misc/ifp-line/Manifest
@@ -0,0 +1,4 @@
+AUX ifp-line-0.3-fix-warnings.patch 1080 BLAKE2B 72e77b8d09dd077d399275ab5f46365be07278208281629416ccff43667c86d709b814c32163161c0e1e5bd4b5bf3dce76306b34a98e874ccb850065a3b83d3c SHA512 348fea237990df0531c32f688f888af2f247a318c711582d5a113531f1e28380c5b62d79947751c7f1180360459a883cd1e505f8e9ac04869fa68392d3a2b400
+DIST ifp-line-0.3.tar.gz 138272 BLAKE2B 249476938d111cc7609069f448b248921211cf298415951f4ea5043a8eff0eb80d11aeb1dab3d5d9db1aeed82b0de205d79945d4b0379762b62bc979485eb95e SHA512 516ad85fdaf69111581b013b2517c7083656436d429a86ec5ca4b7dcaf1c841538f98138cce8839d990a34550f11cc6bc9dedc701b0123b9cb73a91a7d78694d
+EBUILD ifp-line-0.3.ebuild 777 BLAKE2B dfec032550f13547f349b5c23fe570654e4fd04c7352c834eebe87324414dbafb8b1dd64d460cd24500ee329b708f6e65250120ca3b7556845b95cd575f14654 SHA512 f8359d1073a39edb527ded74cde0819675769c07d62a8da2505da31495cb338bb39bc15205d371d5cfec11787e7c1335cb8277ad6f40078409600e19a9080e0c
+MISC metadata.xml 333 BLAKE2B 87a4530824fff1355c5d2af1b6483b6fb1752c5a346b5848500b7962307a2e9956727f08e753b1548fbd941352a4563e9c14ae386bd46f238f8929cc2d46970b SHA512 d0cd8f6fc7bdc757d2a1ef5443f30410514ac335bcd2a84829995c527862b994fc75a8dfc5ceff2b8e2a3d7b0b081a57cbc50e4b825567b8a56d0f9eb00c13c7
diff --git a/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch b/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
new file mode 100644
index 000000000000..a3bf5c24b95d
--- /dev/null
+++ b/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
@@ -0,0 +1,30 @@
+--- a/unicodehack.c 2006-01-31 20:18:16.000000000 -0500
++++ b/unicodehack.c 2006-01-31 20:18:39.000000000 -0500
+@@ -26,7 +26,7 @@
+ return -1;
+ }
+
+- if ( (retval = iconv(cd, (const char **)&src, &srcln, &dst, &dstln)) == -1) {
++ if ( (retval = iconv(cd, (char **)&src, &srcln, &dst, &dstln)) == -1) {
+ // XXX ignore error message "iconv: Illiegal byte sequence"
+ // with GNU libiconv. No effect for output in now.
+ //perror("iconv");
+@@ -43,7 +43,7 @@
+ /**
+ * @return less then zero: error.
+ */
+-int unicode2locale(char *dst, size_t dstln, const char *src, size_t srcln) {
++int unicode2locale(char *dst, size_t dstln, char *src, size_t srcln) {
+ iconv_t cd;
+ int retval;
+
+--- a/unicodehack.h 2006-01-31 20:19:05.000000000 -0500
++++ b/unicodehack.h 2006-01-31 20:19:26.000000000 -0500
+@@ -4,6 +4,6 @@
+ #define IFPLINE_UNICODEHACK_H
+
+ extern int locale2unicode(char*, size_t, const char*, size_t);
+-extern int unicode2locale(char*, size_t, const char*, size_t);
++extern int unicode2locale(char*, size_t, char*, size_t);
+
+ #endif // IFPLINE_UNICODEHACK_H
diff --git a/app-misc/ifp-line/ifp-line-0.3.ebuild b/app-misc/ifp-line/ifp-line-0.3.ebuild
new file mode 100644
index 000000000000..ca5f7b8af6aa
--- /dev/null
+++ b/app-misc/ifp-line/ifp-line-0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="iRiver iFP open-source driver"
+HOMEPAGE="http://ifp-driver.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ifp-driver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" )
+
+src_install() {
+ dobin ifp || die
+ doman ifp.1
+
+ exeinto /usr/share/${PN}
+ doexe nonroot.sh || die
+ default
+}
+
+pkg_postinst() {
+ elog
+ elog "To enable non-root usage of ${PN}, you use any of the following"
+ elog "methods."
+ elog
+ elog " 1. Follow the TIPS file in"
+ elog " /usr/share/doc/${PF}"
+ elog
+ elog " 2. Run /usr/share/${PN}/nonroot.sh"
+ elog
+}
diff --git a/app-misc/ifp-line/metadata.xml b/app-misc/ifp-line/metadata.xml
new file mode 100644
index 000000000000..81812cad1e5b
--- /dev/null
+++ b/app-misc/ifp-line/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">ifp-driver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ignuit-2.24.3 b/app-misc/ignuit-2.24.3
deleted file mode 100644
index 7a79bfca0f6d..000000000000
--- a/app-misc/ignuit-2.24.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/gnome-doc-utils-0.3.2 dev-libs/glib:2 dev-libs/libxml2:2 >=dev-libs/libxslt-1.1.28 >=gnome-base/libgnomeui-2.24.5 >=gnome-base/gconf-3.2.6:2 gnome-base/libglade:2.0 >=media-libs/gstreamer-1.8.2:1.0 x11-libs/gtk+:2 x11-libs/pango latex? ( app-text/dvipng virtual/latex-base ) >=dev-util/intltool-0.50.0 sys-devel/gettext app-text/gnome-doc-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Memorization aid based on the Leitner flashcard system
-EAPI=6
-HOMEPAGE=http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit
-IUSE=examples latex
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=>=app-text/gnome-doc-utils-0.3.2 dev-libs/glib:2 dev-libs/libxml2:2 >=dev-libs/libxslt-1.1.28 >=gnome-base/libgnomeui-2.24.5 >=gnome-base/gconf-3.2.6:2 gnome-base/libglade:2.0 >=media-libs/gstreamer-1.8.2:1.0 x11-libs/gtk+:2 x11-libs/pango latex? ( app-text/dvipng virtual/latex-base )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~leio/distfiles/ignuit-2.24.3.testing.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f35de1370f6a9deb3cb79f658d586a0f
diff --git a/app-misc/ignuit/Manifest b/app-misc/ignuit/Manifest
new file mode 100644
index 000000000000..7c7b7684262c
--- /dev/null
+++ b/app-misc/ignuit/Manifest
@@ -0,0 +1,3 @@
+DIST ignuit-2.24.3.testing.tar.gz 573592 BLAKE2B ae3fb9d5b0616a7305e00aeb54a55199ded1f518725342af39d6b79079589fecaa6bc3b3de541cc963f32972e79348a6fc824410cce975a9ea3ef9592f663852 SHA512 c52997745e905abfcdf8bfa8dfb04065fe05a34a9abdd0348bcb3c480d4bcb56ca279c9074d4659a237593a4697cb18ec7092fd79ee682a2b1a26749e8987d4d
+EBUILD ignuit-2.24.3.ebuild 1223 BLAKE2B 786982de2736d8d0162c71863f626a60ce3e6ad44578404369498065d127c288dd71e915f4484c1b52192e85cff63fe581877fca8ac6fd6f334c2a414c86a02d SHA512 17f0ae5174505773c08c7ecabffc1721cb6b1a228a55cdd9120b2c23abd29d4c258bc9534f64168b00f9e27495a44a4fb7156df7080bf508dbfa42ab7e890dd0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/ignuit/ignuit-2.24.3.ebuild b/app-misc/ignuit/ignuit-2.24.3.ebuild
new file mode 100644
index 000000000000..764322cae997
--- /dev/null
+++ b/app-misc/ignuit/ignuit-2.24.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Memorization aid based on the Leitner flashcard system"
+HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit"
+#SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+# Upstream has put this out as an "emergency release" onto Google Drive; mirror it..
+SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.testing.tar.gz"
+S="${WORKDIR}/${P}.testing"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="examples latex"
+
+RDEPEND="
+ >=app-text/gnome-doc-utils-0.3.2
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ >=dev-libs/libxslt-1.1.28
+ >=gnome-base/libgnomeui-2.24.5
+ >=gnome-base/gconf-3.2.6:2
+ gnome-base/libglade:2.0
+ >=media-libs/gstreamer-1.8.2:1.0
+ x11-libs/gtk+:2
+ x11-libs/pango
+ latex? (
+ app-text/dvipng
+ virtual/latex-base
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.50.0
+ sys-devel/gettext
+ app-text/gnome-doc-utils
+"
+
+src_prepare() {
+ eautoreconf # Needed to fix bogus intltool rules
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/app-misc/ignuit/metadata.xml b/app-misc/ignuit/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/ignuit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/iguanaIR-1.0.1-r1 b/app-misc/iguanaIR-1.0.1-r1
deleted file mode 100644
index c159ada828ea..000000000000
--- a/app-misc/iguanaIR-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-libs/popt sys-apps/lsb-release virtual/libusb:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-lang/swig-2.0.0
-DESCRIPTION=library for Irman control of Unix software
-EAPI=6
-HOMEPAGE=http://iguanaworks.net/index.php
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/popt sys-apps/lsb-release virtual/libusb:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://iguanaworks.net/downloads/iguanaIR-1.0.1.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=7ebb24c703e3998f0aa26994694366a4
diff --git a/app-misc/iguanaIR/Manifest b/app-misc/iguanaIR/Manifest
new file mode 100644
index 000000000000..47e6449bc7b9
--- /dev/null
+++ b/app-misc/iguanaIR/Manifest
@@ -0,0 +1,3 @@
+DIST iguanaIR-1.0.1.tar.bz2 287572 BLAKE2B 6f1a0d3b6dc61199d85bc76892a7a241d8ef19c8bf9a0647074a5ad1433a1745f47f63e5c0dc8e2e543d088efd0d280f02269c0825cb60b46dc3e898273b5c2c SHA512 d70e792d6d51b99d9d82e4411bb16de24846d87b5066592734b614a866cdfb317f3aafbab6ef478552b57c4077776daa6db89b44201103ecaec8fd44df041e0e
+EBUILD iguanaIR-1.0.1-r1.ebuild 1006 BLAKE2B e4c91659ab12bc9461759aca221bae606be8b16a4c33c0a532075d394f139ca2bc6f048cead1aa5a0f540691aee8d4a67af146b57cd1ded6a7e127a237257e69 SHA512 1e327b784cd3117ad00dcd6b6250e5112db4dcdef3a463106c531c5bbb9575adce1d60f2aab42002c197ef436023b70cceab01fd05758aea5898e6c19231af45
+MISC metadata.xml 246 BLAKE2B 944087c83bbbbc622182d61966f7c750d9a195d5e66b4416ce44ee1c0df561f10abd2d2918c6ae35b76ce8a7275c5491f4344ce2093cc3b95e9146bb92fa750a SHA512 868df1fab803f62a132c9c8b53b4e74c3db4b664eb1499c2f484c5b993b1ba138656b3ef9745bc911a53e2628891bf8017e367999f4842f7b27cf34905650004
diff --git a/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild b/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..041069f38491
--- /dev/null
+++ b/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 user
+
+DESCRIPTION="library for Irman control of Unix software"
+HOMEPAGE="http://iguanaworks.net/index.php"
+SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+# sys-apps/lsb-release is used by the init script for detecting Gentoo
+RDEPEND="dev-libs/popt
+ sys-apps/lsb-release
+ virtual/libusb:0
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2.0.0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+ enewgroup iguanair
+ enewuser iguanair -1 -1 -1 'iguanair,usb'
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Working around bug in SWIG version checking
+ sed -i -e 's:1.3.31:2.0.0:g' configure || die
+}
+
+src_install() {
+ default
+ python_optimize
+
+ dodoc WHY notes.txt protocols.txt
+
+ rm -f docs/{Makefile,pullDocs} || die
+ dodoc -r docs
+}
diff --git a/app-misc/iguanaIR/metadata.xml b/app-misc/iguanaIR/metadata.xml
new file mode 100644
index 000000000000..139e8d63a524
--- /dev/null
+++ b/app-misc/iguanaIR/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>hd_brummy@gentoo.org</email>
+<name>Joerg Bornkessel</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/inputlircd-0.0.1_pre15-r2 b/app-misc/inputlircd-0.0.1_pre15-r2
deleted file mode 100644
index c6639b6035ab..000000000000
--- a/app-misc/inputlircd-0.0.1_pre15-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
-EAPI=6
-HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=alpha amd64 ~arm64 ia64 ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=25cadce26b12a574bbd2f539be256130
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
new file mode 100644
index 000000000000..15f1b486ac75
--- /dev/null
+++ b/app-misc/inputlircd/Manifest
@@ -0,0 +1,7 @@
+AUX inputlircd-linux-4.4-fix.patch 343 BLAKE2B 21cf1bb829de88c63993d712335038fb3b71a5188e09a5b19fe5de8341191c37ef2429bab5552ba567466eb9b920a3ff32564f0fc8f08c4e938d1a82e9c91de8 SHA512 444ab491d1a3df60f132d2d1c41ac2668f46586ee434b263f470561026f2cf1ec209461b4473e76dab0a368829679170a37a47d3bd5823dae48574992307d0d9
+AUX inputlircd.conf 75 BLAKE2B 5de0021457cc642073bd3491344ed404c59d8cedd80c6a4517845f42f8e39175c2833d4654d9715c98ae74716d5027f76f9aca8afd694bdef0ac918fcda2258e SHA512 92fcc5d61e1f7061820791d9024dfebfcfd25cc96c1790cc7a719784314587b8e9de9674d9b73a103efe8b405aa453e5dee1759680639aa4297a237003a1f1bb
+AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d1272428c874d0d7daad69b93e3206b271e75f98f1fcf1d57d5a5a44bcd39969d44bafd5c88bc575f SHA512 0d6299a2b1ffd2b6161013888e06a59b531769ce2723b00c1ba55e9420ed4a6055023b1d892e372d1d9c438eabe446a6341adfb2dd9b19371727d1c92b5c27b1
+AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
+DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 907 BLAKE2B 70f9697226ba3a58e6ed1de74bf034dd29814f13fd569524f8e7a5983d1c632446f624e9a4807e5ff6882fcfa0a0305f12b572e64d50a92f8d0bdd91db8801aa SHA512 393bb7e94cfdfab9b037f94476d1f62ee3c1cb38bedf09c22049558f4eb068bcb14d39c9233344091ebfe9d6a1188e60815416d9f95f8433252849007a3cc4e8
+MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/files/inputlircd-linux-4.4-fix.patch b/app-misc/inputlircd/files/inputlircd-linux-4.4-fix.patch
new file mode 100644
index 000000000000..c605e34c3b0b
--- /dev/null
+++ b/app-misc/inputlircd/files/inputlircd-linux-4.4-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 71bc693..3904632 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@ MANDIR ?= $(SHAREDIR)/man
+
+ all: $(SBIN)
+
+-names.h: /usr/include/linux/input.h gennames
++names.h: /usr/include/linux/input-event-codes.h gennames
+ ./gennames $< > $@
+
+ inputlircd: inputlircd.c /usr/include/linux/input.h names.h
diff --git a/app-misc/inputlircd/files/inputlircd.conf b/app-misc/inputlircd/files/inputlircd.conf
new file mode 100644
index 000000000000..7e718ebdfb5b
--- /dev/null
+++ b/app-misc/inputlircd/files/inputlircd.conf
@@ -0,0 +1,2 @@
+# Options to pass to the lircd process
+INPUTLIRCD_OPTS="/dev/input/event2"
diff --git a/app-misc/inputlircd/files/inputlircd.init b/app-misc/inputlircd/files/inputlircd.init
new file mode 100644
index 000000000000..3cde6f917fcb
--- /dev/null
+++ b/app-misc/inputlircd/files/inputlircd.init
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+
+start() {
+ ebegin "Starting lircd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/inputlircd -- ${INPUTLIRCD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lircd"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/inputlircd
+ eend $?
+}
diff --git a/app-misc/inputlircd/files/inputlircd.init.2 b/app-misc/inputlircd/files/inputlircd.init.2
new file mode 100644
index 000000000000..dc599f36e925
--- /dev/null
+++ b/app-misc/inputlircd/files/inputlircd.init.2
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+ provide lirc
+}
+
+start() {
+ ebegin "Starting inputlircd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/inputlircd -- ${INPUTLIRCD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping inputlircd"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/inputlircd
+ eend $?
+}
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
new file mode 100644
index 000000000000..ba0fe2e31990
--- /dev/null
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs versionator
+
+DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
+HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm64 ia64 ppc ppc64 x86"
+
+src_prepare() {
+ local ver="$(best_version sys-kernel/linux-headers)"
+ ver=${ver#sys-kernel/linux-headers-}
+ if version_is_at_least 4.4 ${ver} ; then
+ eapply "${FILESDIR}/inputlircd-linux-4.4-fix.patch"
+ fi
+
+ sed -e 's:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' -i Makefile || die
+
+ default
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+
+ newinitd "${FILESDIR}"/inputlircd.init.2 inputlircd
+ newconfd "${FILESDIR}"/inputlircd.conf inputlircd
+}
diff --git a/app-misc/inputlircd/metadata.xml b/app-misc/inputlircd/metadata.xml
new file mode 100644
index 000000000000..d50a83a22926
--- /dev/null
+++ b/app-misc/inputlircd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">ferdinandhuebner/inputlirc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/interceptty-0.6-r1 b/app-misc/interceptty-0.6-r1
deleted file mode 100644
index 14139c817d2f..000000000000
--- a/app-misc/interceptty-0.6-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=a program that can sit between a serial port and an application
-EAPI=6
-HOMEPAGE=http://www.suspectclass.com/~sgifford/interceptty/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.suspectclass.com/~sgifford/interceptty/files/interceptty-0.6.tar.gz
-_md5_=2ef5e1e7345119d547b45fef886e18e0
diff --git a/app-misc/interceptty/Manifest b/app-misc/interceptty/Manifest
new file mode 100644
index 000000000000..f7a21fc83739
--- /dev/null
+++ b/app-misc/interceptty/Manifest
@@ -0,0 +1,3 @@
+DIST interceptty-0.6.tar.gz 95911 BLAKE2B 61f96b9e0f65296e29ea851b975307fc88f79346ba78d88657f5844f15bc0ba3184fcabda37ce452fe9651d70616e260a86b5f55151f4f8c487d8184f9791fe8 SHA512 0aab17a3f0462d738befae62ffc78c9b72042fd9e9234ce55731b3b7bcef763684c46992cc8b814e982824964963bb1aba14111e0a49c43d3ca6b43e4b9f1095
+EBUILD interceptty-0.6-r1.ebuild 522 BLAKE2B 94f5a7dc08f105fb4dfa13e16afa694eb19be40a24b9b22bbe828173b826184053416ccb83176857fa61c137c992e84ad5b1da69eeae3a916a6f546926f82014 SHA512 2b7b325b1b77fd3576470f24018891b8652c5a2a815b47897ec8aa9dc0a4652c6b633b8666aa62baf631f26a9b5bb59e625cf5ea57833990ebac500d5b0ffa00
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-misc/interceptty/interceptty-0.6-r1.ebuild b/app-misc/interceptty/interceptty-0.6-r1.ebuild
new file mode 100644
index 000000000000..c5ad585cc5e0
--- /dev/null
+++ b/app-misc/interceptty/interceptty-0.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a program that can sit between a serial port and an application"
+HOMEPAGE="http://www.suspectclass.com/~sgifford/interceptty/"
+SRC_URI="http://www.suspectclass.com/~sgifford/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DOCS=( AUTHORS NEWS README TODO )
+
+src_install() {
+ default
+ dobin "${PN}" "${PN}-nicedump"
+ doman "${PN}.1"
+ doman interceptty.1
+ einstalldocs
+}
diff --git a/app-misc/interceptty/metadata.xml b/app-misc/interceptty/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/app-misc/interceptty/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/irtrans-irclient-6.01.05 b/app-misc/irtrans-irclient-6.01.05
deleted file mode 100644
index a10af56ce15e..000000000000
--- a/app-misc/irtrans-irclient-6.01.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=IRTrans Server
-EAPI=2
-HOMEPAGE=http://www.irtrans.de
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-6.01.05.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irtrans-irclient-5.11.04-ip_assign-1.patch.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cc6a9e7a8dc200bbad9e520870d9503
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
new file mode 100644
index 000000000000..d354d93abc38
--- /dev/null
+++ b/app-misc/irtrans-irclient/Manifest
@@ -0,0 +1,4 @@
+DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
+DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
+EBUILD irtrans-irclient-6.01.05.ebuild 1647 BLAKE2B 15d5c9cd56c80697b178798212130e406ca19dcdf3e81c4251b885cffcff37eabe2295390997a916a5d663830bc100d242a57f05597d0cf970600340f7337c00 SHA512 a454497e39e36731065ec6d4d2b78fedfbae575357fefedcd21439267964bc2ae483048c80e59c7e7663e7510a9fd8e70e9ad857ee2525fa2d31212656efb447
+MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
new file mode 100644
index 000000000000..dc6bd63ff3ff
--- /dev/null
+++ b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RESTRICT="strip"
+
+DESCRIPTION="IRTrans Server"
+HOMEPAGE="http://www.irtrans.de"
+SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-${PV}.tar.gz
+ http://ftp.disconnected-by-peer.at/irtrans/${PN}-5.11.04-ip_assign-1.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${RDEPND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ epatch "${WORKDIR}/${PN}"-5.11.04-ip_assign-1.patch
+}
+
+src_compile() {
+
+ append-flags -DLINUX
+
+ # Set sane defaults (arm target has no -D flags added)
+ irbuild=irclient_arm
+ irclient=irclient
+ ipbuild=ip_assign_arm
+ ip_assign=ip_assign
+
+ # change variable by need
+ if use x86 ; then
+ irbuild=irclient
+ ipbuild=ip_assign
+ elif use amd64 ; then
+ irbuild=irclient64
+ irclient=irclient64
+ ipbuild=ip_assign64
+ ip_assign=ip_assign64
+ fi
+
+ # Some output for bugreport
+ einfo "CFLAGS=\"${CFLAGS}\""
+ einfo "Build client Target=\"${irbuild}\""
+ einfo "Build client Binary=\"${irclient}\""
+ einfo "Build ip_assign Target=\"${ipbuild}\""
+ einfo "Build ip_assign Binary=\"${ip_assign}\""
+
+ # Build
+ emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${irbuild}" || die "emake irclient failed"
+ emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${ipbuild}" || die "emake ip_assign failed"
+}
+
+src_install() {
+
+ newbin "${WORKDIR}/${irclient}" irclient
+ newbin "${WORKDIR}/${ip_assign}" ip_assign
+}
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
new file mode 100644
index 000000000000..8143f8cf4708
--- /dev/null
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>mario.fetka@gmail.com</email>
+<name>Mario Fetka</name>
+</maintainer>
+<maintainer type="person">
+<email>hd_brummy@gentoo.org</email>
+<name>Joerg Bornkessel</name>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/irtrans-irserver-6.09.04 b/app-misc/irtrans-irserver-6.09.04
deleted file mode 100644
index e8e9433057b5..000000000000
--- a/app-misc/irtrans-irserver-6.09.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=IRTrans Server
-EAPI=5
-HOMEPAGE=http://www.irtrans.de
-IUSE=mono
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=BSD GPL-2
-RDEPEND=mono? ( >=dev-lang/mono-2.10.5 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://ftp.disconnected-by-peer.at/irtrans/irserver-src-6.09.04.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irserver-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-6.09.04.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e mono-env 1f24c032c78290b0d9a07d5b343051a7 multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ba7be3fc6edb08f0328b7fa543918cc
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
new file mode 100644
index 000000000000..cf8f38340a5d
--- /dev/null
+++ b/app-misc/irtrans-irserver/Manifest
@@ -0,0 +1,6 @@
+AUX irtrans-server.confd 392 BLAKE2B b23c07dc308bcda49f49985b7d6c77c3391a959a142118a0a0a179eff567dfcc36770a1f485f77e3487e0c53227b266a429ecf3ce23a8917eee0966cec64af43 SHA512 daa586469db0aca543bfe97ffc90efd7f8ade94f0d186d9b91499e729dd6c72036c8e539e58898ef28d961a353530aefcc5821e447c9aaa6f35634da2c25867f
+AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3247d69005bf8b48ff2a139228ffdd1032dd9654528ffe77e369a8d8d796a8dc421f626cb8cb7a19519a1c SHA512 fb47c9d695e879e0db95fb5ae427b5d0248c65b6fa701408369c845cad1025cb913d85d68145fd69ad96ee65092b549384ee7e8135f095254840fd25ef7aa781
+DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
+DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
+EBUILD irtrans-irserver-6.09.04.ebuild 2006 BLAKE2B 0add7e689507a9288a13fd1e728635c202587a0d9e5c8a03396a338c32b7109d37e862da59afea77745856fdcd8933db4b7a5c4adb563c933d4045ef1134c3fb SHA512 8e9d565c322ef914c68f2dabbadfd7b4b3bc78f72e196e27a75b0d7b348602e2eaf93bcb343ccb7e35c1bd2ecff217eccb42dcb287e0c1ed69fe7350a7e7dcb3
+MISC metadata.xml 540 BLAKE2B 3355962a1d9d6d94c207254ee0f49639ac55cba6504a4ecae2470c0df4d09189c3d00f76c6dffc554d13ebaa6d154040152a3169da166232ef4f2308c968e160 SHA512 9c1297f57d16730eba72da496f870d67aae2cca6a4c49da99e2f6bd4721f13c9208599b2a1a50ed8409ebb26f772a9906c5f9969f6e2f1f262592b0af2fa4b58
diff --git a/app-misc/irtrans-irserver/files/irtrans-server.confd b/app-misc/irtrans-irserver/files/irtrans-server.confd
new file mode 100644
index 000000000000..28e3f33aa043
--- /dev/null
+++ b/app-misc/irtrans-irserver/files/irtrans-server.confd
@@ -0,0 +1,12 @@
+# Config for irtrans-server
+
+# Controls which information is logged. Standard is loglevel 1.
+# Possible values are 0-4. 0=Nothing is logged. 4=debug output.
+LOGLEVEL="1"
+
+# Starts the irserver as a LINUX Service.
+# run '/usr/bin/irtrans --help' for all Parameters
+OPT="-daemon"
+
+# LINUX Devices: /dev/ttyS0 - /dev/ttySn or /dev/ttyUSB0 - /dev/ttyUSBn for USB devices
+IRDEVICE="/dev/ttyUSB0"
diff --git a/app-misc/irtrans-irserver/files/irtrans-server.initd b/app-misc/irtrans-irserver/files/irtrans-server.initd
new file mode 100644
index 000000000000..b500b7fe0f87
--- /dev/null
+++ b/app-misc/irtrans-irserver/files/irtrans-server.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+ provide lirc
+}
+
+start() {
+ ebegin "Starting IRTrans"
+ eval start-stop-daemon --start --quiet --exec /usr/bin/irserver --pidfile /var/run/irtrans-irserver.pid \
+ -- -logfile /var/log/irserver.log -loglevel "${LOGLEVEL}" -pidfile /var/run/irtrans-irserver.pid "${OPT}" "${IRDEVICE}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping IRTrans"
+ start-stop-daemon --stop --quiet --pidfile /var/run/irtrans-irserver.pid
+ eend $?
+}
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
new file mode 100644
index 000000000000..fb45aecdd9ac
--- /dev/null
+++ b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs mono-env multilib
+
+RESTRICT="strip"
+
+DESCRIPTION="IRTrans Server"
+HOMEPAGE="http://www.irtrans.de"
+SRC_URI="http://ftp.disconnected-by-peer.at/irtrans/irserver-src-${PV}.tar.gz
+ http://ftp.disconnected-by-peer.at/irtrans/irserver-${PV}.tar.gz
+ http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-${PV}.tar.gz
+ http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE="mono"
+
+RDEPEND="mono? ( >=dev-lang/mono-2.10.5 )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ sed -e 's!^ODIRARM = .*!ODIRARM = n800!' -i makefile
+}
+
+src_compile() {
+ append-flags -DLINUX -DMEDIACENTER
+ append-ldflags --static
+
+ # Set sane defaults (arm target has no -D flags added)
+ irbuild=irserver_arm_noccf
+ irserver=irserver
+
+ # change variable by need
+ if use x86 ; then
+ irbuild=irserver
+ elif use amd64 ; then
+ irbuild=irserver64
+ irserver=irserver64
+ elif use arm ; then
+ irbuild=irserver_arm
+ fi
+
+ # Some output for bugreport
+ einfo "CFLAGS=\"${CFLAGS}\""
+ einfo "Build Target=\"${irbuild}\""
+ einfo "Build Binary=\"${irserver}\""
+
+ # Build
+ emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" "${irbuild}"
+}
+
+src_install() {
+ newbin "${WORKDIR}/${irserver}" irserver
+
+ keepdir /etc/irserver/remotes
+
+ docinto remotes
+ dodoc remotes/*
+
+ newinitd "${FILESDIR}"/irtrans-server.initd irtrans-server
+ newconfd "${FILESDIR}"/irtrans-server.confd irtrans-server
+
+ if use mono ; then
+ # Wrapper script to launch mono
+ make_wrapper irguiclient "mono /usr/$(get_libdir)/${PN}/GUIClient.exe"
+
+ insinto /usr/$(get_libdir)/${PN}/
+ exeinto /usr/$(get_libdir)/${PN}/
+
+ # The Libs and Translations
+ doins GUIClient/*.tra
+ doexe GUIClient/*.dll
+
+ # The actual executable
+ doexe GUIClient/*.exe
+ fi
+}
diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
new file mode 100644
index 000000000000..e8fda48bc222
--- /dev/null
+++ b/app-misc/irtrans-irserver/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mario.fetka@gmail.com</email>
+ <name>Mario Fetka</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>hd_brummy@gentoo.org</email>
+ <name>Joerg Bornkessel</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="mono">Enable mono support</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/jail-2.0-r1 b/app-misc/jail-2.0-r1
deleted file mode 100644
index 5aba99748f8a..000000000000
--- a/app-misc/jail-2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Builds a chroot and configures all the required files, directories and libraries
-EAPI=5
-HOMEPAGE=https://github.com/spiculator/jail
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-util/strace
-SLOT=0
-SRC_URI=https://github.com/spiculator/jail/archive/v2.0.tar.gz -> jail-2.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78327a378805adc4d86d53b4b69bc648
diff --git a/app-misc/jail-2.0-r2 b/app-misc/jail-2.0-r2
deleted file mode 100644
index 8e6954e1141f..000000000000
--- a/app-misc/jail-2.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Builds a chroot and configures all the required files, directories and libraries
-EAPI=7
-HOMEPAGE=https://github.com/spiculator/jail
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-util/strace
-SLOT=0
-SRC_URI=https://github.com/spiculator/jail/archive/v2.0.tar.gz -> jail-2.0.tar.gz
-_eclasses_=eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d3e5786a4935459c60b54c61bad38fd6
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
new file mode 100644
index 000000000000..abc0746bf2b3
--- /dev/null
+++ b/app-misc/jail/Manifest
@@ -0,0 +1,10 @@
+AUX jail-1.9-gentoo.patch 3186 BLAKE2B 289f102f6041e4352b0ae1bb1548ae2c4b6c2a2d8c61f0edc98138f2493fe726f0705a107a5b99f249ab7222aad7b02f87b237466ed3b4b0e6bfce9d1e22ef23 SHA512 70293d18269850c8f0971bb62d20849a903de31982fbe91bfb8dd1adb34a4baf1a10c42ffd73804b214586022cf666b199f091a6cc0f83a08f6e049cc74abf22
+AUX jail-1.9-ldflags.patch 328 BLAKE2B f6965d1b43af4b16ec8db30add8b1c448557ad00d6ba0c0793b3b00898fa0decbe42c77822c6361183314c5cd2197e52366e6cb3d5e2197448b7d21a853a380b SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b
+AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a22ec7bfe9b7a1d385d3286615f95571d95887826f72bc09202c77fef03f0158f385db15bc60a67cd29c635637d37a SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541
+AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd
+AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
+AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
+DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
+EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
+EBUILD jail-2.0-r2.ebuild 1932 BLAKE2B 67e57ab57efe111166d9b01f7029e26f4ca6d5961c2e120721da18731c0235131c268210e9e397a750bd2a9c05853699a7722ac7b68f9a7a062b27c6947bb114 SHA512 6efe7c5ce0f9ef53fdc86dbd2fe81758cf28015c1d69c9a1c3bddb139f975de17f8392c9873ca01a67959f1598d70c3588287f43ad7b6fa959b356d8ad7b4692
+MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/files/jail-1.9-gentoo.patch b/app-misc/jail/files/jail-1.9-gentoo.patch
new file mode 100644
index 000000000000..74d48561004c
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-gentoo.patch
@@ -0,0 +1,130 @@
+--- a/install.sh Fri Oct 26 11:37:07 2001
++++ b/install.sh Sat Jul 20 04:43:09 2002
+@@ -23,7 +23,7 @@
+ #
+ ##############################################################################
+
+-TMPFILE=/tmp/jail.tmp
++TMPFILE=jail.tmp
+
+ # ----------------------------------------------------------------------------
+
+@@ -63,16 +63,16 @@
+
+ gen_jail_conf() {
+
+-cp etc/jail.conf /tmp/jail.conf.tmp
++cp etc/jail.conf jail.conf.tmp
+
+-parse_tag /tmp/jail.conf.tmp __VERSION__ $1
+-parse_tag /tmp/jail.conf.tmp __ARCH__ $2
+-parse_tag /tmp/jail.conf.tmp __DEBUG__ $3
+-parse_tag /tmp/jail.conf.tmp __INSTALLDIR__ $4
+-
+-mv /tmp/jail.conf.tmp /tmp/jail.conf
+-install_file /tmp/jail.conf $4/etc $5 $6 $7
+-rm /tmp/jail.conf
++parse_tag jail.conf.tmp __VERSION__ $1
++parse_tag jail.conf.tmp __ARCH__ $2
++parse_tag jail.conf.tmp __DEBUG__ $3
++parse_tag jail.conf.tmp __INSTALLDIR__ $4
++
++mv jail.conf.tmp jail.conf
++install_file jail.conf $4/etc $5 $6 $7
++rm jail.conf
+
+ }
+
+@@ -80,13 +80,13 @@
+
+ gen_libjail() {
+
+-cp lib/libjail.pm /tmp/libjail.pm.tmp
++cp lib/libjail.pm libjail.pm.tmp
+
+-parse_tag /tmp/libjail.pm.tmp __INSTALLDIR__ $1
++parse_tag libjail.pm.tmp __INSTALLDIR__ $1
+
+-mv /tmp/libjail.pm.tmp /tmp/libjail.pm
+-install_file /tmp/libjail.pm $1/lib $2 $3 $4
+-rm /tmp/libjail.pm
++mv libjail.pm.tmp libjail.pm
++install_file libjail.pm $1/lib $2 $3 $4
++rm libjail.pm
+
+ }
+
+@@ -94,14 +94,14 @@
+
+ gen_mkenv() {
+
+-cp bin/mkjailenv /tmp/mkjailenv.tmp
++cp bin/mkjailenv mkjailenv.tmp
+
+-parse_tag /tmp/mkjailenv.tmp __INSTALLDIR__ $1
+-parse_tag /tmp/mkjailenv.tmp __PERL__ $2
++parse_tag mkjailenv.tmp __INSTALLDIR__ $1
++parse_tag mkjailenv.tmp __PERL__ $2
+
+-mv /tmp/mkjailenv.tmp /tmp/mkjailenv
+-install_file /tmp/mkjailenv $1/bin $3 $4 $5
+-rm /tmp/mkjailenv
++mv mkjailenv.tmp mkjailenv
++install_file mkjailenv $1/bin $3 $4 $5
++rm mkjailenv
+
+ }
+
+@@ -109,14 +109,14 @@
+
+ gen_addjailsw() {
+
+-cp bin/addjailsw /tmp/addjailsw.tmp
++cp bin/addjailsw addjailsw.tmp
+
+-parse_tag /tmp/addjailsw.tmp __INSTALLDIR__ $1
+-parse_tag /tmp/addjailsw.tmp __PERL__ $2
++parse_tag addjailsw.tmp __INSTALLDIR__ $1
++parse_tag addjailsw.tmp __PERL__ $2
+
+-mv /tmp/addjailsw.tmp /tmp/addjailsw
+-install_file /tmp/addjailsw $1/bin $3 $4 $5
+-rm /tmp/addjailsw
++mv addjailsw.tmp addjailsw
++install_file addjailsw $1/bin $3 $4 $5
++rm addjailsw
+
+ }
+
+@@ -125,14 +125,14 @@
+
+ gen_addjailuser() {
+
+-cp bin/addjailuser /tmp/addjailuser.tmp
++cp bin/addjailuser addjailuser.tmp
+
+-parse_tag /tmp/addjailuser.tmp __INSTALLDIR__ $1
+-parse_tag /tmp/addjailuser.tmp __PERL__ $2
++parse_tag addjailuser.tmp __INSTALLDIR__ $1
++parse_tag addjailuser.tmp __PERL__ $2
+
+-mv /tmp/addjailuser.tmp /tmp/addjailuser
+-install_file /tmp/addjailuser $1/bin $3 $4 $5
+-rm /tmp/addjailuser
++mv addjailuser.tmp addjailuser
++install_file addjailuser $1/bin $3 $4 $5
++rm addjailuser
+
+ }
+
+--- a/src/preinstall.sh Fri Oct 26 11:36:09 2001
++++ b/src/preinstall.sh Sat Jul 20 04:44:11 2002
+@@ -23,7 +23,7 @@
+ #
+ ##############################################################################
+
+-TMPFILE=/tmp/jail.tmp
++TMPFILE=jail.tmp
+
+
+ # ----------------------------------------------------------------------------
diff --git a/app-misc/jail/files/jail-1.9-ldflags.patch b/app-misc/jail/files/jail-1.9-ldflags.patch
new file mode 100644
index 000000000000..6b9e5731bb27
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile 2001-10-29 18:40:48.000000000 +0100
++++ b/src/Makefile 2010-09-17 07:28:09.000000000 +0200
+@@ -60,7 +60,7 @@
+ all: jail
+
+ jail: jail.c $(OBJ)
+- $(CC) $(CFLAGS) $(INCLUDE) jail.c -o jail $(OBJ) $(LIBS) && \
++ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDE) jail.c -o jail $(OBJ) $(LIBS) && \
+ cp jail ../bin
+
+ clean:
diff --git a/app-misc/jail/files/jail-1.9-multiuser-rsa.patch b/app-misc/jail/files/jail-1.9-multiuser-rsa.patch
new file mode 100644
index 000000000000..e0aad4f65c72
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-multiuser-rsa.patch
@@ -0,0 +1,44 @@
+--- a/src/jail.c 2004-09-19 23:48:14.000000000 -0500
++++ b/src/jail.c 2004-09-20 00:07:48.000000000 -0500
+@@ -115,6 +115,20 @@
+ #include "helpers.h"
+ #include "types.h"
+
++
++
++void make_jail_dir( char* dir )
++{
++ for( ; *dir != '\0'; ++dir )
++ {
++ if( *dir == '.' )
++ {
++ *dir = '\0';
++ break;
++ }
++ }
++}
++
+ //////////////////////////////////////////////////////////////////////////////
+ //
+ // main()
+@@ -211,6 +225,7 @@
+ fprintf(stderr,"jail: can't get passwd info for uid %d\n",uid);
+ exit(-1);
+ }
++ make_jail_dir(pwdent->dir);
+
+ //
+ // create the terminal devices here
+@@ -289,7 +304,6 @@
+ free(pwdent->dir);
+ pwdent->dir = tmp_str;
+
+-
+ #if DEBUG != 0
+ fprintf(stderr,"jail: doing chdir(%s)\n",pwdent->dir);
+ #endif
+@@ -494,4 +508,3 @@
+ return(-4);
+ }
+
+-
diff --git a/app-misc/jail/files/jail-1.9-wrongshell.patch b/app-misc/jail/files/jail-1.9-wrongshell.patch
new file mode 100644
index 000000000000..1924337d06e4
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-wrongshell.patch
@@ -0,0 +1,11 @@
+--- a/lib/arch/generic/functions 2001-10-26 04:36:09.000000000 -0500
++++ b/lib/arch/generic/functions 2003-07-30 18:23:57.000000000 -0500
+@@ -831,7 +831,7 @@
+
+ if (!$found || !-e $SHELLS_FILE) {
+ open(F,">>".$SHELLS_FILE);
+- print F "$INSTALL_DIR/jail\n";
++ print F "$INSTALL_DIR/bin/jail\n";
+ close(F);
+ }
+ }
diff --git a/app-misc/jail/files/jail-2.0-symlinks.patch b/app-misc/jail/files/jail-2.0-symlinks.patch
new file mode 100644
index 000000000000..04b405efe300
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-symlinks.patch
@@ -0,0 +1,11 @@
+--- a/lib/arch/generic/functions~ 2014-07-03 11:37:33.000000000 +0200
++++ b/lib/arch/generic/functions 2018-07-01 10:02:57.101547309 +0200
+@@ -687,7 +687,7 @@
+ return();
+ }
+
+- local $query = "$file_cmd $p_name";
++ local $query = "$file_cmd -L $p_name";
+ local $res = `$query`;
+ local $line;
+
diff --git a/app-misc/jail/files/jail-2.0-sysmacros.patch b/app-misc/jail/files/jail-2.0-sysmacros.patch
new file mode 100644
index 000000000000..ffe6a965934b
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-sysmacros.patch
@@ -0,0 +1,20 @@
+--- a/src/generic_helpers.c
++++ b/src/generic_helpers.c
+@@ -27,6 +27,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- a/src/terminal_helpers.c
++++ b/src/terminal_helpers.c
+@@ -25,6 +25,7 @@
+
+ #include <stdlib.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
new file mode 100644
index 000000000000..60664a83e8e8
--- /dev/null
+++ b/app-misc/jail/jail-2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
+HOMEPAGE="https://github.com/spiculator/jail"
+SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="dev-lang/perl
+ dev-util/strace"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.9-gentoo.patch \
+ "${FILESDIR}"/${PN}-1.9-wrongshell.patch \
+ "${FILESDIR}"/${PN}-1.9-multiuser-rsa.patch \
+ "${FILESDIR}"/${PN}-1.9-ldflags.patch \
+ "${FILESDIR}"/${PN}-2.0-sysmacros.patch
+}
+
+src_compile() {
+ # configuration files should be installed in /etc not /usr/etc
+ sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
+
+ # the destination directory should be /usr not /usr/local
+ sed -i -e "s:usr/local:${D}/usr:g" \
+ -e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
+
+ # Below didn't work. Don't know why
+ #append-ldflags -Wl,-z,now
+ emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake -C src install
+
+ # remove //var/tmp/portage/${P}/image//usr from files
+ FILES=( "${D}/usr/bin/mkjailenv"
+ "${D}/usr/bin/addjailsw"
+ "${D}/usr/bin/addjailuser"
+ "${D}/etc/jail.conf"
+ "${D}/usr/lib/libjail.pm"
+ "${D}/usr/lib/arch/generic/definitions"
+ "${D}/usr/lib/arch/generic/functions"
+ "${D}/usr/lib/arch/linux/definitions"
+ "${D}/usr/lib/arch/linux/functions"
+ "${D}/usr/lib/arch/freebsd/definitions"
+ "${D}/usr/lib/arch/freebsd/functions"
+ "${D}/usr/lib/arch/irix/definitions"
+ "${D}/usr/lib/arch/irix/functions"
+ "${D}/usr/lib/arch/solaris/definitions"
+ "${D}/usr/lib/arch/solaris/functions" )
+
+ for f in "${FILES[@]}"; do
+ sed -i "s:/${D}/usr:/usr:g" ${f} || die
+ done
+
+ sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
+
+ dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
+}
diff --git a/app-misc/jail/jail-2.0-r2.ebuild b/app-misc/jail/jail-2.0-r2.ebuild
new file mode 100644
index 000000000000..8243ee0dfd3c
--- /dev/null
+++ b/app-misc/jail/jail-2.0-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils flag-o-matic
+
+DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
+HOMEPAGE="https://github.com/spiculator/jail"
+SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-lang/perl
+ dev-util/strace
+"
+DEPEND=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9-gentoo.patch
+ "${FILESDIR}"/${PN}-1.9-wrongshell.patch
+ "${FILESDIR}"/${PN}-1.9-multiuser-rsa.patch
+ "${FILESDIR}"/${PN}-1.9-ldflags.patch
+ "${FILESDIR}"/${PN}-2.0-sysmacros.patch
+ "${FILESDIR}"/${PN}-2.0-symlinks.patch #659094
+)
+
+src_compile() {
+ # configuration files should be installed in /etc not /usr/etc
+ sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
+
+ # the destination directory should be /usr not /usr/local
+ sed -i -e "s:usr/local:${D}/usr:g" \
+ -e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
+
+ emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake -C src install
+
+ # remove //var/tmp/portage/${P}/image//usr from files
+ FILES=( "${D}/usr/bin/mkjailenv"
+ "${D}/usr/bin/addjailsw"
+ "${D}/usr/bin/addjailuser"
+ "${D}/etc/jail.conf"
+ "${D}/usr/lib/libjail.pm"
+ "${D}/usr/lib/arch/generic/definitions"
+ "${D}/usr/lib/arch/generic/functions"
+ "${D}/usr/lib/arch/linux/definitions"
+ "${D}/usr/lib/arch/linux/functions"
+ "${D}/usr/lib/arch/freebsd/definitions"
+ "${D}/usr/lib/arch/freebsd/functions"
+ "${D}/usr/lib/arch/irix/definitions"
+ "${D}/usr/lib/arch/irix/functions"
+ "${D}/usr/lib/arch/solaris/definitions"
+ "${D}/usr/lib/arch/solaris/functions" )
+
+ for f in "${FILES[@]}"; do
+ sed -i "s:/${D}/usr:/usr:g" ${f} || die
+ done
+
+ sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
+
+ dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
+}
diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml
new file mode 100644
index 000000000000..425dd3d2d460
--- /dev/null
+++ b/app-misc/jail/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">spiculator/jail</remote-id>
+ <bugs-to>https://github.com/spiculator/jail/issues</bugs-to>
+ </upstream>
+ <longdescription>
+Jail Chroot Project is an attempt of write a tool that builds a chrooted environment.
+The main goal of Jail is to be as simple as possible, and highly portable. The most
+difficult step when building a chrooted environment is to set up the right libraries and
+files. Here, Jail comes to the rescue with a tool to automagically configures and builds
+all the required files, directories and libraries.</longdescription>
+</pkgmetadata>
diff --git a/app-misc/jira-cli-2.1.5 b/app-misc/jira-cli-2.1.5
deleted file mode 100644
index af30bfd088ee..000000000000
--- a/app-misc/jira-cli-2.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jira[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),oauth] dev-python/suds[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-10.0.2-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/keyrings_alt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-4.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hiro[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/vcrpy-1.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Simple command line utility to interact with your jira instance
-EAPI=6
-HOMEPAGE=https://github.com/alisaifee/jira-cli
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jira[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),oauth] dev-python/suds[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-10.0.2-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/keyrings_alt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/alisaifee/jira-cli/archive/2.1.5.tar.gz -> jira-cli-2.1.5.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16610d28c6c5525e1ca8c983eeee0120
diff --git a/app-misc/jira-cli/Manifest b/app-misc/jira-cli/Manifest
new file mode 100644
index 000000000000..dcb3da86e3f1
--- /dev/null
+++ b/app-misc/jira-cli/Manifest
@@ -0,0 +1,3 @@
+DIST jira-cli-2.1.5.tar.gz 122947 BLAKE2B 981f2df0e695da4c7a1db312f148f848f633a65a4fdf74e0235bfc69c1940697558a3c0ab49cab85ea7c7833e7c7ee754d6cd8db01a90370250ec46a8c66d0ee SHA512 8d8cad01d93fcca63ac9420856bca4825bba1e1954e674378c2a3f501c7716125afbda96c5ef12ba4d90e4e771b1d80165aaff1db883af5706510476bd9d8799
+EBUILD jira-cli-2.1.5.ebuild 1227 BLAKE2B d45b3945ec815be085357a6dd94ec20bbf74ca96248c44cc70e6e554a8131df6a2d3d0ebe9e33a7cae53c0f79d2c152a58ea55a50dc6e15d57ada9ce33b03828 SHA512 27db6baac917b364e22338653a4957d92bee9a94bd6cd3221dad41c5500d553a664f9a33f60ca4902fdd8aef9a2633936ff4b14890979c8bda35331d7daa7c55
+MISC metadata.xml 250 BLAKE2B e7d7932fc0bcee598bd952a4eae1b4d987781e4760bbff47cf76fb07cd0c20e11c5f4cd2435a142a95061903894fe4f19436b90dbc2b90fa0a69916e98da2d7a SHA512 a83961ae0675dc47814c64d67093438c96266c1714be601841bc2836dabc9b1ae8fb9c9f2c6f412f2b88aee8b3638648ea9232f7c49faa4c88f1bd4ea00a02bd
diff --git a/app-misc/jira-cli/jira-cli-2.1.5.ebuild b/app-misc/jira-cli/jira-cli-2.1.5.ebuild
new file mode 100644
index 000000000000..8965187ccee3
--- /dev/null
+++ b/app-misc/jira-cli/jira-cli-2.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple command line utility to interact with your jira instance"
+HOMEPAGE="https://github.com/alisaifee/jira-cli"
+SRC_URI="https://github.com/alisaifee/jira-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jira[${PYTHON_USEDEP},oauth]
+ dev-python/suds[${PYTHON_USEDEP}]
+ >=dev-python/keyring-10.0.2-r1[${PYTHON_USEDEP}]
+ dev-python/keyrings_alt[${PYTHON_USEDEP}]"
+
+DEPEND="${CDEPEND}
+ test? ( ${RDEPEND}
+ >=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
+ dev-python/hiro[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/vcrpy-1.7.4[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_prepare_all() {
+ sed -i -e '/ordereddict/d' -e '/argparse/d' requirements/main.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests || die
+}
diff --git a/app-misc/jira-cli/metadata.xml b/app-misc/jira-cli/metadata.xml
new file mode 100644
index 000000000000..1b73437545ed
--- /dev/null
+++ b/app-misc/jira-cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">alisaifee/jira-cli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/jitac-0.3.0 b/app-misc/jitac-0.3.0
deleted file mode 100644
index 22391dc8b7c7..000000000000
--- a/app-misc/jitac-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/sun-jimi:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=An image to ASCII converter written in Java
-EAPI=5
-HOMEPAGE=http://www.roqe.org/jitac/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-java/sun-jimi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.roqe.org/jitac/jitac-0.3.0.src.jar
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a572ecc0006ce9ce59fe1a569dd1d766
diff --git a/app-misc/jitac/Manifest b/app-misc/jitac/Manifest
new file mode 100644
index 000000000000..7f369c2432b8
--- /dev/null
+++ b/app-misc/jitac/Manifest
@@ -0,0 +1,3 @@
+DIST jitac-0.3.0.src.jar 141514 BLAKE2B 7f8028f2971c55d84710a232f32f187f3239e08461e9c534ad5d014f19741c088cd3a294ed1705ef7a940d94163788fd9749b037385c91c2d1b4c639e18d9dbd SHA512 8a21e80246e450c9afb7e92cad14b8901fab7e039a7312df0b87cdab307c68a3db8a1090cb044b74c50eee47dd480f8c8d1465111e2f508584d38c9ef31511f8
+EBUILD jitac-0.3.0.ebuild 970 BLAKE2B 38bbe49ed817eb37e21ecdc66016f790f9570d86d6e50548a06d6aa077a26f4a63a2be4280ce5435eaf33dcbe46f4c7d61397caf1d1d119baef2ce1c2e31a9e9 SHA512 8fa777453cc7791b9d1fd3e962b0a940738c9d5ed6c9f2523b5096841b412dd4cc768b9756e520a703ddd8597fdcc1dbc8de9855b71bdbc76c4abfa523e68883
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-misc/jitac/jitac-0.3.0.ebuild b/app-misc/jitac/jitac-0.3.0.ebuild
new file mode 100644
index 000000000000..7028a28a9b34
--- /dev/null
+++ b/app-misc/jitac/jitac-0.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="An image to ASCII converter written in Java"
+HOMEPAGE="http://www.roqe.org/jitac/"
+SRC_URI="http://www.roqe.org/jitac/${P}.src.jar"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+COMMON_DEP="
+ dev-java/sun-jimi:0"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+ jar -xvf "${DISTDIR}"/${A} || die "failed to unpack"
+}
+
+src_compile() {
+ ejavac -classpath $(java-pkg_getjars sun-jimi):. $(find -name *.java)
+ find . -name "*.class" -or -name "*.bdf" \
+ -or -name "*.properties" -or -name "README" \
+ | xargs jar -cf ${PN}.jar || die "failed to create jar"
+}
+
+src_install() {
+ java-pkg_dojar ${PN}.jar
+ java-pkg_dolauncher ${PN} --main org.roqe.jitac.Jitac
+
+ dodoc org/roqe/jitac/README
+ use doc && java-pkg_dohtml -r org/roqe/jitac/docs/*
+}
diff --git a/app-misc/jitac/metadata.xml b/app-misc/jitac/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/app-misc/jitac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/jot-9.0-r1 b/app-misc/jot-9.0-r1
deleted file mode 100644
index 15df82bfa445..000000000000
--- a/app-misc/jot-9.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Print out increasing, decreasing, random, or redundant data
-EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/bsd-jot/
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.mit.edu/afs/athena/system/rhlinux/athena-9.0/free/SRPMS/athena-jot-9.0-3.src.rpm
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=361537c1db8665bded9fa252ef3c6033
diff --git a/app-misc/jot/Manifest b/app-misc/jot/Manifest
new file mode 100644
index 000000000000..37851716c8f8
--- /dev/null
+++ b/app-misc/jot/Manifest
@@ -0,0 +1,3 @@
+DIST athena-jot-9.0-3.src.rpm 25378 BLAKE2B 2d472d9d4c97d3d0da50d8b50120ee9c3460ed3d65656de51c419a7b9b6ea14e8755d35676b24199c1d6ed50b79d7d55753bc370b148546e12d57fab18473356 SHA512 b284121cbca3e98181285eac007b2c9133826c18157f9d1f983b83443f91a3e00c29b30ceb986fbbd86cda1541f0990b5d66579387b78143c250bb01453d7296
+EBUILD jot-9.0-r1.ebuild 506 BLAKE2B b7dda3f4cbe88b1b44bc665baaa78233c812601f01fb20fa191a4bf08f2ee50e3bf2d860703ce8da61d86d99dfb6fc5f952425dcc108a0e7e659e3f7958ae8b8 SHA512 5d110fe5f71f3c9b11dbb97c7c1178882708bfef9e4066c72e8cd72aa42c1abe150d7ce554ad073f7e3bc96da5cb3b9db59aa12c619f1afab123e7e07cf3f44d
+MISC metadata.xml 340 BLAKE2B 4dd8785f3735e5b6599af1687792c9e5a5265abf7a8591d78f7c09889956e9abcba7440ed16a06d9490880428de876e818a9a3da9a4642a5ebcd3cc8c204b245 SHA512 7bb1de852b98f75b4886a9973db26545f64cdf4fde83192ab73899b6761f481bfa8f5b89bf9cb6f2fbfe735241b1ed5a7909a40e2d0c29f4724c2f19c99d1a7a
diff --git a/app-misc/jot/jot-9.0-r1.ebuild b/app-misc/jot/jot-9.0-r1.ebuild
new file mode 100644
index 000000000000..477b2f953e88
--- /dev/null
+++ b/app-misc/jot/jot-9.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit rpm toolchain-funcs
+
+RH_REV=3
+
+DESCRIPTION="Print out increasing, decreasing, random, or redundant data"
+HOMEPAGE="http://freshmeat.net/projects/bsd-jot/"
+SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/athena-${P}-${RH_REV}.src.rpm"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/athena-${P}"
+
+src_prepare() {
+ tc-export CC
+}
diff --git a/app-misc/jot/metadata.xml b/app-misc/jot/metadata.xml
new file mode 100644
index 000000000000..9b765471967a
--- /dev/null
+++ b/app-misc/jot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freshmeat">bsd-jot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/joy2key-1.6.3-r1 b/app-misc/joy2key-1.6.3-r1
deleted file mode 100644
index 65c6d4790c29..000000000000
--- a/app-misc/joy2key-1.6.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=X? ( x11-libs/libX11 x11-apps/xwininfo ) X? ( x11-base/xorg-proto )
-DESCRIPTION=An application that translates joystick events to keyboard events
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/joy2key
-IUSE=X
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=X? ( x11-libs/libX11 x11-apps/xwininfo )
-SLOT=0
-SRC_URI=mirror://sourceforge/joy2key/joy2key-1.6.3.tar.bz2
-_md5_=3dd6382df53816a9fd2a1189630dc353
diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
new file mode 100644
index 000000000000..f67b7426583c
--- /dev/null
+++ b/app-misc/joy2key/Manifest
@@ -0,0 +1,3 @@
+DIST joy2key-1.6.3.tar.bz2 70545 BLAKE2B 6e2d14f5a348cdd684e947685ca73735d4c6580d49296486ee79bc68c5f5d08d07c42f79370a75b5cf629001a5c89c6d334a6f6ed7e845209ac1d8f008e66b1c SHA512 33767058cb32aa18a418d37f48d80200a99ce12b765ec758bde7efdda575ffc78af3039584fe3ef267baaacc3724b3203d858017c945824cc949b9cd6fe97bec
+EBUILD joy2key-1.6.3-r1.ebuild 635 BLAKE2B 2964b3c159537bc07ee1b97317dffac59233df77ca405c1166e7462368443380f1c7d07d3ecf80f1aaf7426a695201623daf2ba5faa58417d2f9c99a49ab4e84 SHA512 960a68afb4f4166041b9c91e1446faf1f4dfa5e49ca10082c38a9f6e3fed324c288d6e36f87f32798dbbd1351ea14dfb3f7d88e13076c39bae2542eaa6bc156e
+MISC metadata.xml 244 BLAKE2B 743fbbe02778ebafa1c27c9ab5648a3b84111b49d19e939f937f03788164c6409a19c284162e75f210d306b1bd616bd63195df501c8819a4fa7b611bab36f878 SHA512 4bb71014a1a32d8f334488977c78efe9058b5246c77ce6e60c099ad3e56b931cba7b95a3535f7c0a5f030cbac3efaeff8811a9fb43a9bf77eca0afaf0117f182
diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..00ef6ed03b4b
--- /dev/null
+++ b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An application that translates joystick events to keyboard events"
+HOMEPAGE="https://sourceforge.net/projects/joy2key"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X"
+
+RDEPEND="
+ X? ( x11-libs/libX11
+ x11-apps/xwininfo )"
+DEPEND="
+ ${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+
+DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO )
+
+src_configure() {
+ econf --disable-dependency-tracking $(use_enable X)
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/joy2key/metadata.xml b/app-misc/joy2key/metadata.xml
new file mode 100644
index 000000000000..b0d736f7f995
--- /dev/null
+++ b/app-misc/joy2key/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">joy2key</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/joymouse-0.5 b/app-misc/joymouse-0.5
deleted file mode 100644
index 286d0b3a84af..000000000000
--- a/app-misc/joymouse-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
-DESCRIPTION=An application that translates joystick events to mouse events
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/joymouse-linux
-KEYWORDS=amd64 ~mips ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=mirror://sourceforge/joymouse-linux/joymouse-0.5.tar.gz
-_md5_=d1fab79b68b8441b610ae797a77f17a5
diff --git a/app-misc/joymouse/Manifest b/app-misc/joymouse/Manifest
new file mode 100644
index 000000000000..8974f755d0f1
--- /dev/null
+++ b/app-misc/joymouse/Manifest
@@ -0,0 +1,3 @@
+DIST joymouse-0.5.tar.gz 92464 BLAKE2B 9051107bb11445011f4d9cd5a546ef7652c857dc48d307a168af948de6bb2dc18a5894598ce0b6940a50cc8afca7eefbde9f1301bb620210bce887955dbc470e SHA512 85831ee72bf518dd8337b6d5cc7fac48bfbe9f4e038d3b05e42279e2aef58c6aa191e4027f9a06cd0e4713ac1d3f692cd5d58d1a263cbe234f590011eb8a6c2b
+EBUILD joymouse-0.5.ebuild 581 BLAKE2B 8ab7b839a8337edc617c6986f7dd23f2ab34e0cb3bc07725307fd6cd5f5dae254ef4a2777ee2746a34224b655b6f3c89de92420a98fcb08eac8d99e35a345840 SHA512 aa27ab89637b9f09c6dbb6f57f371bd0fd1fcaa087448ca55a3964d7801928484672085ece5eec72a063c36a26169715dc39674ae2879222d1faaabc4d10005a
+MISC metadata.xml 337 BLAKE2B 966b79dfb4d85c9c7955fd8555421a9e284de99a2a1ae26b428ad9fd4087e537d862426002c6d67e7d39277ae7a1ef2f33dc3174e292c110e985a770788f5ece SHA512 8591ff3f582a6b43725bab8eb4c76c391af184a8845c11d135f2fd029f7e2097f16aef1e76a2794c9305d9f002b33f50b210b58221f4176811f6e8180062d209
diff --git a/app-misc/joymouse/joymouse-0.5.ebuild b/app-misc/joymouse/joymouse-0.5.ebuild
new file mode 100644
index 000000000000..a34fee3f186c
--- /dev/null
+++ b/app-misc/joymouse/joymouse-0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="An application that translates joystick events to mouse events"
+HOMEPAGE="https://sourceforge.net/projects/joymouse-linux"
+SRC_URI="mirror://sourceforge/joymouse-linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXtst"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+src_prepare() {
+ sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/joymouse/metadata.xml b/app-misc/joymouse/metadata.xml
new file mode 100644
index 000000000000..d36e4caf521e
--- /dev/null
+++ b/app-misc/joymouse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">joymouse-linux</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/jq-1.5-r3 b/app-misc/jq-1.5-r3
deleted file mode 100644
index 794ad4353d3e..000000000000
--- a/app-misc/jq-1.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/bison-3.0 sys-devel/flex oniguruma? ( dev-libs/oniguruma:=[static-libs?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A lightweight and flexible command-line JSON processor
-EAPI=6
-HOMEPAGE=https://stedolan.github.com/jq/
-IUSE=oniguruma static-libs
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
-LICENSE=MIT CC-BY-3.0
-RDEPEND=!static-libs? ( oniguruma? ( dev-libs/oniguruma[static-libs?] ) )
-SLOT=0
-SRC_URI=https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3385d3be9841efa45cfd30fa4f0ed33a
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
new file mode 100644
index 000000000000..488b05f81d73
--- /dev/null
+++ b/app-misc/jq/Manifest
@@ -0,0 +1,6 @@
+AUX jq-1.5-dynamic-link.patch 292 BLAKE2B 65edf9902b3a97621cb5485931d6978625b89870e0728c92dec008abf0a978aa1ea496245294c0a8eed75498abec5a01b7fea8efa8185b7c54d4140e75af8abd SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee
+AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 BLAKE2B ae161ea9ce220f57ee5aeec1b9d202de8401dcb5e842ba8d105eb3a2bc2cbd0f387980d76bfe8a30a6304ea04a1d00fe8733e7dab46507602d16eac74387f3a6 SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718
+AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf268efb3429417ee5e32d666dc33debea89aa7550c4bbad3c5938a6a0bf0cb4adfc2c0173b7bfeac3dcd16c52b19be6e92733ea8dfee89b4b5 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d
+DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
+EBUILD jq-1.5-r3.ebuild 1385 BLAKE2B e5e6fcc3dd40dc2a6667763dced918ed3c007275a2daecb60704ecfdcacae7398fcba373809c9f22c146f91caafae4b4d2b0eeae6c187a2cfeb34efdb9027d6d SHA512 da253fc8d393a3106437b5cba2a4c618076f9c8d23b834d8aab2079de876a53e8a2f2b5ebcd6d79ff48b53c54276a81aa314ccbbbc22e02d720a800a40e20ef7
+MISC metadata.xml 423 BLAKE2B 1e5f03ac7d6b93814bdfe760d9b2d9b74447272b554f7e92c40918069c7787ee8c60dd68a86df38c67f27422f0f281c7ad7234305a45532b657be0397a5b81af SHA512 1787b1ce5d050aaa440996ceaf2367e39192af71e7d9a0d973e8dc8a87854f910aefd020c869867e3da5da33d27cc261047a1ded58b18052b21bf6737ef3081c
diff --git a/app-misc/jq/files/jq-1.5-dynamic-link.patch b/app-misc/jq/files/jq-1.5-dynamic-link.patch
new file mode 100644
index 000000000000..dbc2f11acb7f
--- /dev/null
+++ b/app-misc/jq/files/jq-1.5-dynamic-link.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index c3a771f..274c01e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -84,7 +84,7 @@ main.c: version.h
+
+ bin_PROGRAMS = jq
+ jq_SOURCES = main.c version.h
+-jq_LDFLAGS = -static-libtool-libs
++jq_LDFLAGS =
+ jq_LDADD = libjq.la -lm
+
+ if ENABLE_ALL_STATIC
diff --git a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch
new file mode 100644
index 000000000000..edb07d8388b5
--- /dev/null
+++ b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch
@@ -0,0 +1,34 @@
+From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
+From: Nicolas Williams <nico@cryptonector.com>
+Date: Sat, 24 Oct 2015 17:24:57 -0500
+Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105)
+
+This was an off-by one: the NUL terminator byte was not allocated on
+resize. This was triggered by JSON-encoded numbers longer than 256
+bytes.
+---
+ src/jv_parse.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/jv_parse.c b/src/jv_parse.c
+index 3102ed4..84245b8 100644
+--- a/jv_parse.c
++++ b/jv_parse.c
+@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) {
+
+ static void tokenadd(struct jv_parser* p, char c) {
+ assert(p->tokenpos <= p->tokenlen);
+- if (p->tokenpos == p->tokenlen) {
++ if (p->tokenpos >= (p->tokenlen - 1)) {
+ p->tokenlen = p->tokenlen*2 + 256;
+ p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen);
+ }
+@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) {
+ TRY(value(p, v));
+ } else {
+ // FIXME: better parser
+- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
++ p->tokenbuf[p->tokenpos] = 0;
+ char* end = 0;
+ double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end);
+ if (end == 0 || *end != 0)
diff --git a/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch b/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch
new file mode 100644
index 000000000000..95ba0e058056
--- /dev/null
+++ b/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch
@@ -0,0 +1,58 @@
+commit 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2
+Author: David Tolnay <dtolnay@gmail.com>
+Date: Sat Nov 21 10:05:37 2015 -0800
+
+ Support --without-oniguruma
+
+diff --git a/configure.ac b/configure.ac
+index 9e2c8cf..7f6be34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,27 +52,26 @@ fi
+ AC_ARG_WITH([oniguruma],
+ [AS_HELP_STRING([--with-oniguruma=prefix],
+ [try this for a non-standard install prefix of the oniguruma library])],
+- [ONIGURUMAPATHSET=1],
+- [ONIGURUMAPATHSET=0])
+-
+-if test $ONIGURUMAPATHSET = 1; then
+- CFLAGS="$CFLAGS -I${with_oniguruma}/include"
+- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
+-fi
+-
+-# check for ONIGURUMA library
+-HAVE_ONIGURUMA=0
+-AC_CHECK_HEADER("oniguruma.h",
+- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;]))
+-
+-# handle check results
+-if test $HAVE_ONIGURUMA != 1; then
+- AC_MSG_NOTICE([Oniguruma was not found.])
+- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ])
+-else
+- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed])
+-fi
+-
++ [],
++ [with_oniguruma=yes])
++
++AS_IF([test "x$with_oniguruma" != xno], [
++ AS_IF([test "x$with_oniguruma" != xyes], [
++ CFLAGS="$CFLAGS -I${with_oniguruma}/include"
++ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
++ ])
++ # check for ONIGURUMA library
++ have_oniguruma=0
++ AC_CHECK_HEADER("oniguruma.h",
++ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;]))
++ # handle check results
++ AS_IF([test $have_oniguruma = 1], [
++ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed])
++ ], [
++ AC_MSG_NOTICE([Oniguruma was not found.])
++ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX'])
++ ])
++])
+
+ dnl Check for valgrind
+ AC_CHECK_PROGS(valgrind_cmd, valgrind)
diff --git a/app-misc/jq/jq-1.5-r3.ebuild b/app-misc/jq/jq-1.5-r3.ebuild
new file mode 100644
index 000000000000..f2b7f8001e52
--- /dev/null
+++ b/app-misc/jq/jq-1.5-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="A lightweight and flexible command-line JSON processor"
+HOMEPAGE="https://stedolan.github.com/jq/"
+SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="MIT CC-BY-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+IUSE="oniguruma static-libs"
+
+DEPEND="
+ >=sys-devel/bison-3.0
+ sys-devel/flex
+ oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
+"
+RDEPEND="
+ !static-libs? (
+ oniguruma? ( dev-libs/oniguruma[static-libs?] )
+ )
+"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-1.5-dynamic-link.patch
+ "${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch
+ "${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
+ )
+
+ use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
+ sed -i '/^dist_doc_DATA/d' Makefile.am || die
+ sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
+ configure.ac || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local econfargs=(
+ # don't try to rebuild docs
+ --disable-docs
+ --disable-valgrind
+ $(use_enable static-libs static)
+ $(use_with oniguruma)
+ )
+ econf "${econfargs[@]}"
+}
+
+src_install() {
+ local DOCS=( AUTHORS README )
+ default
+
+ use static-libs || prune_libtool_files
+}
diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
new file mode 100644
index 000000000000..d9b5cb1343c4
--- /dev/null
+++ b/app-misc/jq/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <use>
+ <flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">stedolan/jq</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/kanatest-0.4.8 b/app-misc/kanatest-0.4.8
deleted file mode 100644
index 80ffc1ee8a36..000000000000
--- a/app-misc/kanatest-0.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet
-EAPI=5
-HOMEPAGE=http://www.clayo.org/kanatest
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2 GPL-2+
-RDEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:=
-SLOT=0
-SRC_URI=http://www.clayo.org/kanatest/kanatest-0.4.8.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=966ae3e4cc91f968301c6dd7ed8a2977
diff --git a/app-misc/kanatest/Manifest b/app-misc/kanatest/Manifest
new file mode 100644
index 000000000000..a8567d117763
--- /dev/null
+++ b/app-misc/kanatest/Manifest
@@ -0,0 +1,6 @@
+AUX kanatest-0.4.8+gtk-2.22.patch 967 BLAKE2B d8e0802faeccdf32449ec49ff6f2a828dbf78663d690ed543a6e5cae20fa651de4e106476408bff623e016fe446f06641cfedba06d3d07031b1705b360c67a24 SHA512 d996ba512c7b10d8971cd5f7ee1bd25517f1847f3f4466e25b3217fbff23c6164ac51e5d29bc4ed6f6e02251e02f00b5d430e004d50b8f00eab468efc4f51def
+AUX kanatest-0.4.8-autoconf.patch 363 BLAKE2B 4f73332578adaeae1d9cd9368e377b76810e1b1c4c2e8fe02f2e647c15b95bd4bd860a24955b27b7ee223a321e0fa88386b45ae47f3786dc4f23a00e1ad7dd39 SHA512 25dff41e539ce5b758799df673735407c13560762a091a886e552c26be4dd7191bcd867523756e1f0b52066c13774ee16d5b1a32deb94e0355a9ae1396d0cf54
+AUX kanatest-0.4.8-cflags.patch 432 BLAKE2B 95da5c15032bf7476814da5b2a8d946f8a65f19e410618a59c3872122f2d9fd8499b1bc273941152034e0860f5700060eb96360012b20ab5a95c058f12bd250f SHA512 7d1d9ffda261a918d37b76fac63e641428c41ac225845cfe58b1bf5e4c8908447c56340f581b918ef55d34754f7b795d4cd0fb1eb03ea6327e43b719a95a367d
+DIST kanatest-0.4.8.tar.gz 302154 BLAKE2B b5bc8668f2526abef3ec576c5781b16d7c226f744613a38010125bcb1c977f0fc0b58809ba2a468a216f4b4d7b974e0d12693eea9754cc4a0ce75efcedfb1333 SHA512 c52a5e4104c17eae29f03f30abd7f003c83757e04298427112593603eab0edf7d7927b0567a053f2ea3b8aac66921546180c452d84ef6b3cdc2a361f14cbac47
+EBUILD kanatest-0.4.8.ebuild 956 BLAKE2B 8494f89142a2b7d0ffc8c38581e5f5b26c35aa8bf3e867ab5b09d132c495b5f3eee6dc99e3bf1ecea4109a64df78f20dabd89812e51c4fa9b5963f3a38d8701d SHA512 df15f6d6a70bbf03f6432d47967997a19bb0e31b1f6cbc4037a5580c1f6fee12f3312a2b8af1baa0010640922506997f00dc288d053151b2ffbf5b861cb83036
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch b/app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch
new file mode 100644
index 000000000000..5db2c1e0adaf
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch
@@ -0,0 +1,23 @@
+Index: kanatest-0.4.8/Makefile.am
+===================================================================
+--- kanatest-0.4.8.orig/Makefile.am
++++ kanatest-0.4.8/Makefile.am
+@@ -1,5 +1,5 @@
+ SUBDIRS = src po data
+-ACLOCAL_AMFLAGS = -I m4 -Wall
++ACLOCAL_AMFLAGS = -Wall
+
+ EXTRA_DIST = README AUTHORS TRANSLATORS COPYING ChangeLog
+
+Index: kanatest-0.4.8/src/Makefile.am
+===================================================================
+--- kanatest-0.4.8.orig/src/Makefile.am
++++ kanatest-0.4.8/src/Makefile.am
+@@ -1,6 +1,5 @@
+ REVISION := $(shell if test -e .svn; then echo -DREV=\"`LC_ALL=C svn info | sed -n '/^Rev/p'| sed -e 's/^Revision:\ //'`\"; fi;)
+-AM_CPPFLAGS = -Wall -DLOCALEDIR=\"$(datadir)/locale\" $(REVISION) \
+- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++AM_CPPFLAGS = -Wall -DLOCALEDIR=\"$(datadir)/locale\" $(REVISION)
+ bin_PROGRAMS = kanatest
+ kanatest_SOURCES = about.c about.h \
+ chart.c chart.h \
diff --git a/app-misc/kanatest/files/kanatest-0.4.8-autoconf.patch b/app-misc/kanatest/files/kanatest-0.4.8-autoconf.patch
new file mode 100644
index 000000000000..e92747646a6c
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-autoconf.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index eca7a05..b5ac45c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ(2.59)
+ AC_INIT([Kanatest], [0.4.8], [pasp@users.sf.net])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
+ AC_CONFIG_SRCDIR([src/about.c])
+ AC_CONFIG_HEADER([config.h])
+
diff --git a/app-misc/kanatest/files/kanatest-0.4.8-cflags.patch b/app-misc/kanatest/files/kanatest-0.4.8-cflags.patch
new file mode 100644
index 000000000000..1f3835803e8b
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index b5ac45c..c2c6d18 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,7 +38,7 @@ AC_CHECK_LIB(xml2,
+ [],
+ [AC_MSG_ERROR(You do not appear to have libxml2 installed.)])
+
+-CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"
++CFLAGS="$CFLAGS $BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"
+ CXXFLAGS="$CFLAGS"
+ CPPFLAGS="$gtk_CFLAGS $xml_CFLAGS"
+ LIBS="$gtk_LIBS $xml_LIBS"
diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
new file mode 100644
index 000000000000..903fce705d6e
--- /dev/null
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
+HOMEPAGE="http://www.clayo.org/kanatest"
+SRC_URI="http://www.clayo.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.12:2=
+ dev-libs/libxml2:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS="AUTHORS TRANSLATORS ChangeLog README"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}+gtk-2.22.patch \
+ "${FILESDIR}"/${P}-autoconf.patch \
+ "${FILESDIR}"/${P}-cflags.patch
+
+ sed -i \
+ -e '/Encoding/d' \
+ -e '/^Categories/s:Application;::' \
+ -e '/^Icon/s:.png::' \
+ data/${PN}.desktop || die
+
+ eautoreconf
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-misc/kanatest/metadata.xml b/app-misc/kanatest/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/app-misc/kanatest/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/khal-0.9.7 b/app-misc/khal-0.9.7
deleted file mode 100644
index 611810b29591..000000000000
--- a/app-misc/khal-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/freezegun python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A CalDAV based calendar
-EAPI=6
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/icalendar[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.9.7.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c7ddcc401edfe5005e44e4299764de2
diff --git a/app-misc/khal-0.9.8 b/app-misc/khal-0.9.8
deleted file mode 100644
index baa39f38b2f9..000000000000
--- a/app-misc/khal-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/freezegun python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A CalDAV based calendar
-EAPI=6
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/icalendar[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.9.8.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=888eed75323edea9b685e234a7743664
diff --git a/app-misc/khal-0.9.9-r1 b/app-misc/khal-0.9.9-r1
deleted file mode 100644
index 80b48272f770..000000000000
--- a/app-misc/khal-0.9.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/freezegun python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A CalDAV based calendar
-EAPI=6
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/icalendar-3.11.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/python-dateutil-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.9.9.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b344b795e67b6a6ccabb4ece49072e9c
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
new file mode 100644
index 000000000000..9cc3934007f5
--- /dev/null
+++ b/app-misc/khal/Manifest
@@ -0,0 +1,7 @@
+DIST khal-0.9.7.tar.gz 173401 BLAKE2B a0ab87f8ff4546f589b7cc05586c1aa36cf80760234df00241d9eaaced3bcf37bb8b4bb282c39491f69c9ad6fea0f89af3836c29e23294356847bb88fce645b8 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180
+DIST khal-0.9.8.tar.gz 173717 BLAKE2B d17a355bd4eddaaf3cf838bac6e66f6a4a72170d6e166aa9fe00d44295031d336651bbb74e2ab73a6ae85275f02f8bf035b6798e280055dd6e38dd139f30c6c8 SHA512 4c47bd18e7458ca7a6adf0684872923b4e49e6bfe481269cf9f77dee29dd47dbacf0d557890080618b4d3f08766fc8fae32de7682167642f0705e5b3b6b5dc01
+DIST khal-0.9.9.tar.gz 171830 BLAKE2B 924df2bc8cfa8373ded88e9173e57a6017fd0c0d7ff507d79cd8ef8845d81e3962130d1def3a0070c6a68a00bf27a80d5b851bf79c23087f8513d1ae81222566 SHA512 cc38d8852e5bd47e266e23d48fbafa66aa1f84d67022780b7b0c8c8d4f54860be06a4d2675c49a48b4551fbdce1ec99762fd3b12a2ada69a0768d200697ef03e
+EBUILD khal-0.9.7.ebuild 1207 BLAKE2B d7cfe30f0bc7bddab804832f705d4e71ad800886a98a9dc0fc2b6db98bbda40cd49a150cce0081d40ff69ad270eafd9ffe29e4c9f1a3858c92baa2e6187dbf21 SHA512 d7ca15a1a4003b4da7ae77e8917c5746b55c35c4286bdf82dbd8acf14ed0c468151466d5f279d4a4b5b066a48d9f6b48ec5f53bc7f109bf825184e9e53b62166
+EBUILD khal-0.9.8.ebuild 1206 BLAKE2B e27a03775b1c98238e145746743ccb8fe3c8d28633816dc6f8da37becc4b9933c21a354cc459c0276f65bf7369dd4e625954bdd65428f1726145d4aa1aea4b3c SHA512 0f73cd31b3d77d8e5b224ad310abff1ce32ea8fe05ee4a8302fffc601e98ef29debf89f9921cea5c2c0c97bdc066388ea558cfe32854f1b588cd02cd840b5fa3
+EBUILD khal-0.9.9-r1.ebuild 1223 BLAKE2B 6b1f1622bad85c13e3b4dfee66a212257f52b0a98d7c280d28e224bc32d84355f5488b34d1d523e5002dbb7068f255bed25a43e323d91a88c5c89a6dd1bd6f78 SHA512 ab12da121c47f73282a3e3ecc2cb1c051ffba1ec2dae2f1f3ced207495e87a2de04706bc3d94349719cf83d8d08b75b6e87627fc1d41da319134f9c333a44209
+MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.9.7.ebuild b/app-misc/khal/khal-0.9.7.ebuild
new file mode 100644
index 000000000000..794c616f1a86
--- /dev/null
+++ b/app-misc/khal/khal-0.9.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+ >=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
+ dev-python/icalendar[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+ >=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ zsh-completion? ( app-shells/zsh )"
+
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+ dev-python/freezegun"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+ distutils-r1_src_install
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins misc/__khal
+ fi
+}
diff --git a/app-misc/khal/khal-0.9.8.ebuild b/app-misc/khal/khal-0.9.8.ebuild
new file mode 100644
index 000000000000..ad2991cf1a98
--- /dev/null
+++ b/app-misc/khal/khal-0.9.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+ >=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
+ dev-python/icalendar[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+ >=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+ dev-python/freezegun"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+ distutils-r1_src_install
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins misc/__khal
+ fi
+}
diff --git a/app-misc/khal/khal-0.9.9-r1.ebuild b/app-misc/khal/khal-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..327d1777de15
--- /dev/null
+++ b/app-misc/khal/khal-0.9.9-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+ >=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+ >=dev-python/icalendar-3.11.7[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ <=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+ >=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+ dev-python/freezegun"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+ distutils-r1_src_install
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins misc/__khal
+ fi
+}
diff --git a/app-misc/khal/metadata.xml b/app-misc/khal/metadata.xml
new file mode 100644
index 000000000000..82b122eb7d08
--- /dev/null
+++ b/app-misc/khal/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>amynka@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">khal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/khard-0.11.4 b/app-misc/khard-0.11.4
deleted file mode 100644
index edd052155267..000000000000
--- a/app-misc/khard-0.11.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Console CardDAV client
-EAPI=6
-HOMEPAGE=https://github.com/scheibler/khard
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/atomicwrites[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/vobject-0.9.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khard/khard-0.11.4.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=877c63135f06c7af1e357e52bb14e1ae
diff --git a/app-misc/khard-0.12.2 b/app-misc/khard-0.12.2
deleted file mode 100644
index 7529b404b1a4..000000000000
--- a/app-misc/khard-0.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Console CardDAV client
-EAPI=6
-HOMEPAGE=https://github.com/scheibler/khard
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64
-LICENSE=GPL-3
-RDEPEND=dev-python/atomicwrites[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ruamel-yaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/vobject-0.9.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khard/khard-0.12.2.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6cc0cf33d8cbf14bcfa98d2bc43cdb48
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
new file mode 100644
index 000000000000..874bbb73c15f
--- /dev/null
+++ b/app-misc/khard/Manifest
@@ -0,0 +1,5 @@
+DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
+DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
+EBUILD khard-0.11.4.ebuild 1056 BLAKE2B c76efd9de7fafd0627daad28594c11de71d65d2315dee87dc1dab7ae80d02fca7d82e8d11fe525c74b4caf45fbc1422e5ae3593fb28a3eec9e82ef25a956124d SHA512 02a4b8786589a7fedd7e922f3f217d0172bc01f434bfe34246d0f8d93e3e78e25d0e7ebfcfa2f556a6e720b868a39d1a8965413aa5356698824997aca581d2eb
+EBUILD khard-0.12.2.ebuild 1097 BLAKE2B 206ac7d0574a3b5c1b8ecd481fad937a9a36316b09ebfe3eb044806407e87a540a4c4bb0ae358bf31df48214e45ef6e9ba7868e67758aa2d1747b507adb87fc2 SHA512 82fa6c023edacdfe82998ae782dd48f83ab175d3f18c38db5bd77a49b166f9ef27e71e484dcf33fddfe0f518141b0a8b00678517614fba84972c0f30f3fdeb56
+MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
new file mode 100644
index 000000000000..7ab4f204a958
--- /dev/null
+++ b/app-misc/khard/khard-0.11.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="zsh-completion"
+
+if [ "${PV}" == "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/atomicwrites[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
+"
+# vobject-0.9.3 breaks khard, see
+# https://github.com/scheibler/khard/issues/87
+# https://github.com/eventable/vobject/issues/39
+
+DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
+
+src_install() {
+ distutils-r1_src_install
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins misc/zsh/_khard
+ fi
+}
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
new file mode 100644
index 000000000000..c33592340225
--- /dev/null
+++ b/app-misc/khard/khard-0.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="zsh-completion"
+
+if [ "${PV}" == "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="amd64 ~arm64"
+fi
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/atomicwrites[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ dev-python/unidecode[${PYTHON_USEDEP}]
+ >dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
+"
+# vobject-0.9.3 breaks khard, see
+# https://github.com/scheibler/khard/issues/87
+# https://github.com/eventable/vobject/issues/39
+
+DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
+
+src_install() {
+ distutils-r1_src_install
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins misc/zsh/_khard
+ fi
+}
diff --git a/app-misc/khard/metadata.xml b/app-misc/khard/metadata.xml
new file mode 100644
index 000000000000..2faaf218914d
--- /dev/null
+++ b/app-misc/khard/metadata.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>andrey_utkin@gentoo.org</email>
+ <name>Andrey Utkin</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">scheibler/khard</remote-id>
+</upstream>
+<longdescription>Console CardDAV client</longdescription>
+</pkgmetadata>
diff --git a/app-misc/klavaro-3.0.1 b/app-misc/klavaro-3.0.1
deleted file mode 100644
index b057b49f67ab..000000000000
--- a/app-misc/klavaro-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango dev-util/intltool >=sys-devel/gettext-0.18.3 dev-util/gtk-builder-convert >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Another free touch typing tutor program
-EAPI=5
-HOMEPAGE=http://klavaro.sourceforge.net/
-IUSE=+static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/project/klavaro/klavaro-3.01.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c28a43cd4088d91536ee9f93435cd25a
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
new file mode 100644
index 000000000000..55f865d1aa5a
--- /dev/null
+++ b/app-misc/klavaro/Manifest
@@ -0,0 +1,7 @@
+AUX klavaro-3.0.1-datadir.patch 996 BLAKE2B 5c5835f19bd72378ba79285e900c268e31457489ce2ff6e45a322f5ef4c3ad45f0c8cef9e229b50c30505d6d6dcbddb5ae1fd738fe5c876b4f5092a48593d381 SHA512 2f2547945af46df703a5e9276be0a55f899ab10341f370beb4fee1eb241c235e5ea99f8069e9c8989c4ff42e6b7130741bd8c5a0ed47ce63dbeae1fb3b9a0e8c
+AUX klavaro-3.0.1-out-of-source.patch 334 BLAKE2B d511ce6bafcc56882e42871d3e04b863e5c2f9ab141a15366d7554005ddda3828dade00010603e1f73ecf5200818b9214d2abdb4fddba167a410b3f548e15654 SHA512 d33e2a22e710a24016630b2f61b7804eb5ef49142148047c9d8b9a79a22ed788694c66cc01f68d0ce5be6b581e26fc5f4fe104b8fd68e7b0d9098c29c021b6ad
+AUX klavaro-3.0.1-static.patch 295 BLAKE2B f2a95fd25aa8d931176788523ca7b00c5670a617ed540b6b6409b3a7f47c9f636d7224a62caac2f7760a9aae7ee16052c923485d12727f1286f4c1aed3fd2843 SHA512 9b7bbe2fe977df36afc7ebcb286b71e081c78ec1b72d611d78442250360fb8da2e8c424bcc327194268a39ab8ab1cce2a27be6a182bf7872284432e28a340863
+AUX klavaro-desktop-keywords.patch 488 BLAKE2B b6c34f6bd99f239a8815e58c0b574e70c02890d030c40a055afba0f27d84e180bf61441a5a06e2aad66d992a38edfbc4f97759b32efa7b93f8a3a2b15a188197 SHA512 34ee19f48c34ab5c79afc83eca15b24fe4ee85fee9105926cee9291815f2be0f9d991e740cacced1c27602c23121b03a630db3308f77aa7325c26fe07715f07b
+DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
+EBUILD klavaro-3.0.1.ebuild 859 BLAKE2B e3a4a983238b9e557f2e1d5f5f34c0b1b17683f4b7bd31e2a855f2719f3a4a501dbd640265e73fc0d8baf9c47fcdbf0e3d3c985757bf4a6eed94ec7220d78ef8 SHA512 05b3d4c7b737430bdb4c8b0aed2384a93b3bf7e52d51030b594b28b9cd28a918143c19577ef0130db9a2fd6d681e79d7f9e1b9ead7d8bbac4173cfc2607f411a
+MISC metadata.xml 244 BLAKE2B d00878c0c5edc36629a30cd4005404290bd7eb773d5d715f189d89e05f019b84e0c25dd18c2b8a0010e9737d7c4da343d3fd79db1c196dd01c47bebe2ff30077 SHA512 cba7dce2e4ffc562ca054e00c09dc2d6ef32c8ba4928224c361374f4ae61164624a56ff7778328d624feb4a1de20be8c69f1bc4762f30babbfd67658a78694a4
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
new file mode 100644
index 000000000000..21047a197ccb
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
@@ -0,0 +1,27 @@
+--- data/Makefile.am 2014-12-18 23:16:47.513887559 -0500
++++ data/Makefile.am 2014-12-18 23:16:59.060609420 -0500
+@@ -151,11 +151,11 @@
+ EXTRA_DIST = $(klavaro_data)
+ else
+ @INTLTOOL_DESKTOP_RULE@
+-desktopdir = $(prefix)/$(DATADIRNAME)/applications
++desktopdir = $(datadir)/applications
+ desktop_in_file = klavaro.desktop.in
+ desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
+ @INTLTOOL_XML_RULE@
+-appdatadir = $(prefix)/$(DATADIRNAME)/appdata
++appdatadir = $(datadir)/appdata
+ appdata_in_files = klavaro.appdata.xml.in
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ DISTCLEANFILES = $(desktop_DATA) \
+--- src/Makefile.am 2014-12-18 23:17:35.956725053 -0500
++++ src/Makefile.am 2014-12-18 23:17:45.309501898 -0500
+@@ -20,7 +20,7 @@
+
+ AM_CPPFLAGS = @GTK_CFLAGS@ \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
++ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
+
+ AM_CFLAGS = -Wextra \
+ -I$(top_srcdir)/gtkdatabox
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
new file mode 100644
index 000000000000..5e4a9d48fbd1
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am 2014-09-05 10:26:56.000000000 -0400
++++ src/Makefile.am 2014-12-18 21:27:55.443335860 -0500
+@@ -29,7 +29,7 @@
+
+ klavaro_LDADD = @GTK_LIBS@ \
+ -lgmodule-2.0 \
+- $(top_srcdir)/gtkdatabox/libgtkdataboks.la
++ $(top_builddir)/gtkdatabox/libgtkdataboks.la
+
+ if IS_POSIX
+ AM_CFLAGS += -export-dynamic
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch
new file mode 100644
index 000000000000..010cd11de005
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.0.1-static.patch
@@ -0,0 +1,8 @@
+--- gtkdatabox/Makefile.am 2014-12-18 21:26:18.129806730 -0500
++++ gtkdatabox/Makefile.am 2014-12-18 21:26:30.528364491 -0500
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libgtkdataboks.la
++noinst_LTLIBRARIES = libgtkdataboks.la
+ libgtkdataboks_la_SOURCES= \
+ gtkdatabox.c\
+ gtkdatabox_marshal.c\
diff --git a/app-misc/klavaro/files/klavaro-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-desktop-keywords.patch
new file mode 100644
index 000000000000..fbf39ab954be
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-desktop-keywords.patch
@@ -0,0 +1,11 @@
+--- data/klavaro.desktop.in 2015-01-07 21:52:37.877646655 -0500
++++ data/klavaro.desktop.in 2015-01-07 21:52:56.391720366 -0500
+@@ -2,7 +2,7 @@
+ Name=Klavaro
+ _Comment=A very flexible and efficient touch typing tutor.
+ # Translators: these are keywords related to the program. CAI above means Computer Aided Instruction. Feel free to add and/or change the keywords in your language.
+-_Keywords=keyboard;typing;tutor;CAI
++_Keywords=keyboard;typing;tutor;CAI;
+
+ Exec=klavaro
+ Icon=klavaro
diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild
new file mode 100644
index 000000000000..85aeeb7371d5
--- /dev/null
+++ b/app-misc/klavaro/klavaro-3.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils versionator
+
+MY_P="${PN}-$(delete_version_separator 2)"
+
+DESCRIPTION="Another free touch typing tutor program"
+HOMEPAGE="http://klavaro.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+static-libs"
+
+RDEPEND="
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango
+"
+# gtk+3 version needed
+# x11-libs/gtkdatabox
+
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ >=sys-devel/gettext-0.18.3
+ dev-util/gtk-builder-convert
+ "
+
+PATCHES=(
+ "${FILESDIR}"/${P}-out-of-source.patch
+ "${FILESDIR}"/${P}-static.patch
+ "${FILESDIR}"/${P}-datadir.patch
+ "${FILESDIR}"/${PN}-desktop-keywords.patch
+ )
+
+S="${WORKDIR}"/${MY_P}
diff --git a/app-misc/klavaro/metadata.xml b/app-misc/klavaro/metadata.xml
new file mode 100644
index 000000000000..0320234782c0
--- /dev/null
+++ b/app-misc/klavaro/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">klavaro</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/kryoflux-dtc-2.6 b/app-misc/kryoflux-dtc-2.6
deleted file mode 100644
index fc5423563899..000000000000
--- a/app-misc/kryoflux-dtc-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=KryoFlux Host Software
-EAPI=6
-HOMEPAGE=https://www.kryoflux.com
-IUSE=demos doc fast-firmware gui static
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=SPS
-RDEPEND=dev-libs/spsdeclib virtual/libusb:1 virtual/udev gui? ( virtual/jre )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2 gui? ( https://www.kryoflux.com/kryoflux-ui.jar )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13d5ae8bebccc43974d0fc4b5cd8944c
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
new file mode 100644
index 000000000000..90e6f460c8f8
--- /dev/null
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -0,0 +1,4 @@
+DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
+DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
+EBUILD kryoflux-dtc-2.6.ebuild 2416 BLAKE2B f46de2423db72922873ea8f9c6dccc2736c3a2fcfb68dd5b611519b7689a3d22f9b4892c2ad5bd32d2d9ee1e93fc2302413400b69c89ec6df71ce6509d0d8215 SHA512 f0bf9fa0b0f9e915a136386585f5668082f0cda3dc7b76b7ba30c4976002fcc6c4fd61c56479bf8c104444d0377538c354479fbbbbf80eee41cc2a49413aa61f
+MISC metadata.xml 582 BLAKE2B 6efbcc8d9b65499ea7025dcf9bbf1352a52abbe34a77d8ac59a8f022448ea82d12d84516104b7a719d4e9014a51460bcae29efce62a9a5e6bb41332286528dc1 SHA512 00f628fd32ab3a5568f9bbc841c38732b07d9db58ed2020703dfb0908aeaec2b07d8a6aa84e884442981126755c7d6f92cbef7238c38f2c3d6fc985a3721e9e7
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
new file mode 100644
index 000000000000..de512258d895
--- /dev/null
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="kryoflux_${PV}_linux"
+
+inherit desktop eutils udev xdg-utils
+
+DESCRIPTION="KryoFlux Host Software"
+HOMEPAGE="https://www.kryoflux.com"
+SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.bz2
+ gui? ( https://www.kryoflux.com/kryoflux-ui.jar )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="SPS"
+SLOT="0"
+IUSE="demos doc fast-firmware gui static"
+
+RDEPEND="dev-libs/spsdeclib
+ virtual/libusb:1
+ virtual/udev
+ gui? ( virtual/jre )"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="/usr/bin/kryoflux-dtc"
+
+src_unpack() {
+ unpack ${MY_P}.tar.bz2
+
+ if use gui; then
+ # Updated *.jar for compatibility with >= Java 9
+ cp "${DISTDIR}"/kryoflux-ui.jar "${S}" || die
+
+ # Extract kryoflux-ui.jar to get a logo for the meny entry
+ unpack kryoflux-ui.jar
+ fi
+}
+
+src_install() {
+ newbin dtc/$(usex amd64 x86_64 i686)/$(usex static static dynamic)/dtc kryoflux-dtc
+
+ cat <<-EOF > "${T}"/80-kryoflux.rules || die
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
+ EOF
+ udev_dorules "${T}"/80-kryoflux.rules
+
+ if use gui; then
+ insinto /usr/share/kryoflux-ui
+ doins kryoflux-ui.jar
+
+ dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
+
+ make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
+
+ newicon "${WORKDIR}"/images/disk.png kryoflux-ui.png
+
+ make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
+
+ dodoc dtc/kryoflux-ui_README.txt
+ fi
+
+ if use fast-firmware; then
+ insinto /lib/firmware
+ doins dtc/firmware_fast/firmware_kf_usb_rosalie.bin
+
+ dodoc dtc/firmware_fast/firmware_fast_README.txt
+ else
+ insinto /lib/firmware
+ doins dtc/firmware_kf_usb_rosalie.bin
+ fi
+
+ if use demos; then
+ dodoc -r g64_demo ipf_demo
+ fi
+
+ if use doc; then
+ dodoc -r docs schematics
+ fi
+
+ local DOCS=( "DONATIONS.txt" "RELEASE.txt" "README.linux" )
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "If you want to access your Kryoflux without root access,"
+ elog "please add yourself to the floppy group."
+
+ if use fast-firmware; then
+ elog ""
+ elog "You have enabled the fast firmware. Please keep in mind,"
+ elog "that this firmware can cause trouble with older floppy drives."
+ fi
+
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
diff --git a/app-misc/kryoflux-dtc/metadata.xml b/app-misc/kryoflux-dtc/metadata.xml
new file mode 100644
index 000000000000..c95657a7f862
--- /dev/null
+++ b/app-misc/kryoflux-dtc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="demos">Install example floppy game files.</flag>
+ <flag name="fast-firmware">Install fast firmware instead of slow firmware.</flag>
+ <flag name="gui">Install the Kryoflux GUI</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/ktoblzcheck-1.49 b/app-misc/ktoblzcheck-1.49
deleted file mode 100644
index 0340cac36148..000000000000
--- a/app-misc/ktoblzcheck-1.49
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=app-text/recode sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-devel/libtool
-DESCRIPTION=Library to check account numbers and bank codes of German banks
-EAPI=6
-HOMEPAGE=http://ktoblzcheck.sourceforge.net/
-IUSE=python python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/recode sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.49.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8436677df8cb6827604af6ac9d296139
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
new file mode 100644
index 000000000000..280d2da3ae82
--- /dev/null
+++ b/app-misc/ktoblzcheck/Manifest
@@ -0,0 +1,3 @@
+DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
+EBUILD ktoblzcheck-1.49.ebuild 862 BLAKE2B 98ed370e98ec1abc27d79aad8b2c7ffc9cf6487a14643ec19317ab8516a0fa310a0114c8954e8b70b36f63cd52427f4fb12df2518509f20b79ee83851b28c004 SHA512 e05af846b5a27a2b51e55708998898cafd5774ac8388f5cad02a67eb4194d568d2713b3051902e60c18ec94071afbf261f2d084f4fd07263612b17bab779f397
+MISC metadata.xml 297 BLAKE2B c7fe2728b531d1325f0335b85b9fdf9b0cb828780ccd279dd516af6036ec17f5c0416564b50e1cb972690a43e6a250f0c120dd90e1533f36d6077508214f4133 SHA512 c4c121f254990adfc30d96af3e0d58bbf937863f521422d759779dba224f3eb6a904c7e5a03bdd65e25afcc0fd67fb8ffd84566799771b1c73bf7f43d9c92c0a
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
new file mode 100644
index 000000000000..7b070a25b3a4
--- /dev/null
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Library to check account numbers and bank codes of German banks"
+HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="python"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+ app-text/recode
+ sys-apps/grep
+ sys-apps/sed
+ virtual/awk
+ || ( net-misc/wget www-client/lynx )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+ sys-devel/libtool
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ econf $(use_enable python)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-misc/ktoblzcheck/metadata.xml b/app-misc/ktoblzcheck/metadata.xml
new file mode 100644
index 000000000000..e7d969e77aff
--- /dev/null
+++ b/app-misc/ktoblzcheck/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">ktoblzcheck</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/lcd4linux-0.10.1_rc2-r4 b/app-misc/lcd4linux-0.10.1_rc2-r4
deleted file mode 100644
index 322ac0b5393f..000000000000
--- a/app-misc/lcd4linux-0.10.1_rc2-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=mysql? ( virtual/mysql ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) lcd_devices_bwct? ( =virtual/libusb-0* ) lcd_devices_g15? ( =virtual/libusb-0* ) lcd_devices_lcd2usb? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) lcd_devices_trefon? ( =virtual/libusb-0* ) lcd_devices_usbhub? ( =virtual/libusb-0* ) lcd_devices_usblcd? ( =virtual/libusb-0* ) lcd_devices_luise? ( dev-libs/luise-bin ) lcd_devices_ncurses? ( sys-libs/ncurses:0= ) lcd_devices_noritake? ( media-libs/gd ) lcd_devices_t6963? ( media-libs/gd ) lcd_devices_png? ( media-libs/libpng:0= media-libs/gd ) lcd_devices_X? ( x11-libs/libX11 media-libs/gd ) lcd_devices_serdisplib? ( dev-libs/serdisplib media-libs/gd ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Shows system and ISDN information on an external display or in a X11 window
-EAPI=5
-HOMEPAGE=https://lcd4linux.bulix.org/
-IUSE=mysql python iconv mpd lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_cfontz lcd_devices_ncurses lcd_devices_cwlinux lcd_devices_ea232 lcd_devices_g15 lcd_devices_hd44780 lcd_devices_hd44780i2c lcd_devices_lcd2usb lcd_devices_lcdlinux lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_m50530 lcd_devices_mtxorb lcd_devices_milfordbpk lcd_devices_noritake lcd_devices_null lcd_devices_picolcd lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_serdisplib lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_trefon lcd_devices_usbhub lcd_devices_usblcd lcd_devices_wincor lcd_devices_X lcd_devices_luise python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) lcd_devices_bwct? ( =virtual/libusb-0* ) lcd_devices_g15? ( =virtual/libusb-0* ) lcd_devices_lcd2usb? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) lcd_devices_trefon? ( =virtual/libusb-0* ) lcd_devices_usbhub? ( =virtual/libusb-0* ) lcd_devices_usblcd? ( =virtual/libusb-0* ) lcd_devices_luise? ( dev-libs/luise-bin ) lcd_devices_ncurses? ( sys-libs/ncurses:0= ) lcd_devices_noritake? ( media-libs/gd ) lcd_devices_t6963? ( media-libs/gd ) lcd_devices_png? ( media-libs/libpng:0= media-libs/gd ) lcd_devices_X? ( x11-libs/libX11 media-libs/gd ) lcd_devices_serdisplib? ( dev-libs/serdisplib media-libs/gd ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://gentoo/lcd4linux-0.10.1-RC2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6f5180ece959cb236dec3751d73f4dd
diff --git a/app-misc/lcd4linux-0.11.0_pre20170527 b/app-misc/lcd4linux-0.11.0_pre20170527
deleted file mode 100644
index 13c00ef272a8..000000000000
--- a/app-misc/lcd4linux-0.11.0_pre20170527
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dmalloc? ( dev-libs/dmalloc ) lcd_devices_astusb? ( virtual/libusb:0= ) lcd_devices_bwct? ( virtual/libusb:0= ) lcd_devices_curses? ( sys-libs/ncurses:0= ) lcd_devices_dpf? ( virtual/libusb:0= ) lcd_devices_g15? ( virtual/libusb:0= ) lcd_devices_glcd2usb? ( virtual/libusb:0= ) lcd_devices_irlcd? ( virtual/libusb:0= ) lcd_devices_lcd2usb? ( virtual/libusb:0= ) lcd_devices_ledmatrix? ( virtual/libusb:0= ) lcd_devices_luise? ( dev-libs/luise-bin virtual/libusb:0= ) lcd_devices_matrixorbitalgx? ( virtual/libusb:0= ) lcd_devices_mdm166a? ( virtual/libusb:0= ) lcd_devices_picolcd? ( virtual/libusb:0= ) lcd_devices_picolcdgraphic? ( virtual/libusb:0= ) lcd_devices_png? ( media-libs/gd[png] media-libs/libpng:0= ) lcd_devices_ppm? ( media-libs/gd ) lcd_devices_samsungspf? ( virtual/libusb:0= ) lcd_devices_serdisplib? ( dev-libs/serdisplib ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_trefon? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= virtual/libusb:0= ) lcd_devices_usbhub? ( virtual/libusb:0= ) lcd_devices_usblcd? ( virtual/libusb:0= ) lcd_devices_vnc? ( net-libs/libvncserver ) lcd_devices_x11? ( x11-libs/libX11 ) asterisk? ( net-misc/asterisk ) dbus? ( sys-apps/dbus ) gps? ( dev-libs/nmeap ) hddtemp? ( app-admin/hddtemp ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) mpris_dbus? ( sys-apps/dbus ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) wireless? ( || ( net-wireless/iw net-wireless/wireless-tools ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small program that grabs information and displays it on an external LCD
-EAPI=6
-HOMEPAGE=https://lcd4linux.bulix.org/
-IUSE=dmalloc outb lcd_devices_astusb lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_crystalfontz lcd_devices_curses lcd_devices_cwlinux lcd_devices_d4d lcd_devices_dpf lcd_devices_ea232graphic lcd_devices_efn lcd_devices_futabavfd lcd_devices_fw8888 lcd_devices_g15 lcd_devices_glcd2usb lcd_devices_hd44780 lcd_devices_hd44780-i2c lcd_devices_irlcd lcd_devices_lcd2usb lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_luise lcd_devices_lw_abp lcd_devices_m50530 lcd_devices_matrixorbital lcd_devices_matrixorbitalgx lcd_devices_milfordinstruments lcd_devices_mdm166a lcd_devices_newhaven lcd_devices_noritake lcd_devices_null lcd_devices_pertelian lcd_devices_phanderson lcd_devices_picgraphic lcd_devices_picolcd lcd_devices_picolcdgraphic lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_sample lcd_devices_samsungspf lcd_devices_serdisplib lcd_devices_shuttlevfd lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_teaklcm lcd_devices_trefon lcd_devices_ula200 lcd_devices_usbhub lcd_devices_usblcd lcd_devices_vnc lcd_devices_wincornixdorf lcd_devices_x11 apm asterisk button_exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3 proc_stat python qnaplog raspi sample statfs uname uptime w1retap wireless python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dmalloc? ( dev-libs/dmalloc ) lcd_devices_astusb? ( virtual/libusb:0= ) lcd_devices_bwct? ( virtual/libusb:0= ) lcd_devices_curses? ( sys-libs/ncurses:0= ) lcd_devices_dpf? ( virtual/libusb:0= ) lcd_devices_g15? ( virtual/libusb:0= ) lcd_devices_glcd2usb? ( virtual/libusb:0= ) lcd_devices_irlcd? ( virtual/libusb:0= ) lcd_devices_lcd2usb? ( virtual/libusb:0= ) lcd_devices_ledmatrix? ( virtual/libusb:0= ) lcd_devices_luise? ( dev-libs/luise-bin virtual/libusb:0= ) lcd_devices_matrixorbitalgx? ( virtual/libusb:0= ) lcd_devices_mdm166a? ( virtual/libusb:0= ) lcd_devices_picolcd? ( virtual/libusb:0= ) lcd_devices_picolcdgraphic? ( virtual/libusb:0= ) lcd_devices_png? ( media-libs/gd[png] media-libs/libpng:0= ) lcd_devices_ppm? ( media-libs/gd ) lcd_devices_samsungspf? ( virtual/libusb:0= ) lcd_devices_serdisplib? ( dev-libs/serdisplib ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_trefon? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= virtual/libusb:0= ) lcd_devices_usbhub? ( virtual/libusb:0= ) lcd_devices_usblcd? ( virtual/libusb:0= ) lcd_devices_vnc? ( net-libs/libvncserver ) lcd_devices_x11? ( x11-libs/libX11 ) asterisk? ( net-misc/asterisk ) dbus? ( sys-apps/dbus ) gps? ( dev-libs/nmeap ) hddtemp? ( app-admin/hddtemp ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) mpris_dbus? ( sys-apps/dbus ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) wireless? ( || ( net-wireless/iw net-wireless/wireless-tools ) )
-REQUIRED_USE=?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c ) python? ( python_targets_python2_7 ) || ( lcd_devices_astusb lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_crystalfontz lcd_devices_curses lcd_devices_cwlinux lcd_devices_d4d lcd_devices_dpf lcd_devices_ea232graphic lcd_devices_efn lcd_devices_futabavfd lcd_devices_fw8888 lcd_devices_g15 lcd_devices_glcd2usb lcd_devices_hd44780 lcd_devices_hd44780-i2c lcd_devices_irlcd lcd_devices_lcd2usb lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_luise lcd_devices_lw_abp lcd_devices_m50530 lcd_devices_matrixorbital lcd_devices_matrixorbitalgx lcd_devices_milfordinstruments lcd_devices_mdm166a lcd_devices_newhaven lcd_devices_noritake lcd_devices_null lcd_devices_pertelian lcd_devices_phanderson lcd_devices_picgraphic lcd_devices_picolcd lcd_devices_picolcdgraphic lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_sample lcd_devices_samsungspf lcd_devices_serdisplib lcd_devices_shuttlevfd lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_teaklcm lcd_devices_trefon lcd_devices_ula200 lcd_devices_usbhub lcd_devices_usblcd lcd_devices_vnc lcd_devices_wincornixdorf lcd_devices_x11 ) || ( apm asterisk button_exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3 proc_stat python qnaplog raspi sample statfs uname uptime w1retap wireless )
-SLOT=0
-SRC_URI=https://www.bl4ckb0x.de/files/lcd4linux-0.11.0_pre20170527.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ecb788aade5b1f0dae8274b8b6e803ff
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
new file mode 100644
index 000000000000..1e4430ca9649
--- /dev/null
+++ b/app-misc/lcd4linux/Manifest
@@ -0,0 +1,13 @@
+AUX lcd4linux-0.10.1_rc2-autoconf-2.65.patch 593 BLAKE2B 4dfc40b408c668db5b0ddb74a0328d58b542e342142c055496782c9606cb6408284d900c8eb07da0f32ec2857a547c9ab468e0cd9e5d66aaef7b9126bdd1dd03 SHA512 55f09599fa894f9ce7aa128e708d7c7bc145630d0db6ec31b04302cdf9df19aec12a05debf66dc8fb8cf6b657f3f6c430ae6615a946c7d84a7b6875880241bb2
+AUX lcd4linux-0.10.1_rc2-missing-header.patch 337 BLAKE2B 2fd4f1a58bde455739880d2ce3232120a34b08869e2823b712a67d385f86f8c2a86620a8da9c35899ea0350606d9c18140d35530facfe747465bda94d705a1ce SHA512 3bec09fbd773565945c925a39412223e1f59db2752290ba945d254ccdf826b8789162c7482d98feca8ebd0dde14be7ce18c46fb7c4d98cd9c4129d4e96dfea89
+AUX lcd4linux-0.10.1_rc2-mpd.patch 9230 BLAKE2B d20fe911ced307e3ab99ac3b23913faad177fb18fa911376a2f2dbfa53852c0d99098d9da7424df711c5360116d8fc5af4e3b100e3a30d5f09f0e619e19a1a24 SHA512 8763f22deb728d5bfbd4ae601c3cc8808ada042374b604a3787429497373d6d52cbe48f72be37d149f823debfdc740b2a23db5fe2e20ab1091743f2d6ba186af
+AUX lcd4linux-0.10.1_rc2-nordtsc.patch 4703 BLAKE2B 951f35d6b935cc74d7a39b8101015b762627591e2942513755d134c456e59017827fd542b09481b3a2b9e1fc409746c2e454567e89a45b1fa583aaad861edcaa SHA512 fb0579cde4ce812e4f26a3e30f0b223c9dbafd07ccf297dffb8ba50bc757f2a7a01c37d456b4a8c8b5ec616a4b694d2efd11a55d1f2e20f4397bfcdda1d59585
+AUX lcd4linux-0.10.1_rc2-usbdebug.patch 3032 BLAKE2B f6672c30554fd271b5fbaf2832ec2d55c3e14544147cfbdbfa29a579f7a59243a08b6523af779938db4c2f7cf368d7f47dfe7c6581ece5bcd4f4fc60efbc96d2 SHA512 252ebab0e125c2189178f1de35c46d398f79d4b5fd4ff5b92c72874e95c7b45c25eaa92b600a8d5a160e4e45c265f69b6240123c6d2ec4076c7947659e46ae46
+AUX lcd4linux-0.10.1_rc2-warnings.patch 2229 BLAKE2B 4e4c6f34ffc440083890df845616cb723bb26756ea08b34d7dc01da25abe33b59b4bb81f78a53c6c71a57dab42bc30429ba4b399c2c55b1611c3443bf8d454b2 SHA512 ee6b163dc93f2913c629b056ec79cffaecbdb9124d187be8e616e10cc3cec917d98cc8131fda9d3b310530c00cd61dc1617dce4f54143c77962cbc0c58f4d615
+AUX lcd4linux-0.10.1_rc2.initd 539 BLAKE2B 314810d6bf8a402a435dc1cb53f610ed1f0fd3ec8965cc9fd798b5aa097bf1c35a5baa4a76dc9ed7d244943c9aa1b05aaf5e010b431522fdc3d7d45bbdffeca4 SHA512 c3f6cc42bb6c0d7ecaa180c28c0d9a9530b32dca97cb563960a0c30ca9cbed80a7b249f970d791ba034f115ef22218feac7a449ab6fe69109a1427565d62be07
+AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
+DIST lcd4linux-0.10.1-RC2.tar.gz 386188 BLAKE2B 7d396ee15e00212eb314721cd9627147ec1654f43fff1d3ae3f8c38d33d8d133f1fd5c53ef2b78eba7afefb7f65a53810da52a903911abdd95383b2b2c28d06f SHA512 8c4299f50ab4068d4106ba32309f4f66bfedf382a4aed7495cf400d22c57c22c4dfabd80f7e4355417c5c0d964e69f0c268a50bae6924b759b720bd728a969f9
+DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
+EBUILD lcd4linux-0.10.1_rc2-r4.ebuild 5156 BLAKE2B 9cd0d0231dfec0ff6fab4c668969e16a546e70167d0d495caf8d527554521a1878e3b4f14451ce7abd29c2db7b8c0bb87cb2815a087c79777592e431a8b4610d SHA512 a17a33cbeac88b0eec6a6d5fb8435667f3f9d5c33bb77e360ba7d755f6c3c138d3d6a7ee87c83eee4f4679d4df59dc27457a61ed108c0a11ed30d2dbf8d4b1d9
+EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5555 BLAKE2B a97eb9b0efd8b22abafd271d53f1530cd126694515c8a9d0a7e6a340178354ffadd99904901eac4615d0572f478242bab55905669b32b7c91e02dd6d873be6d4 SHA512 af9afccf37f5c92ec522aa8e86678ec71fb9c702162eb040385a691adfdb0c5a5afaac1cb9d5ad230f3d01f96c4e296c241ba2ebda8b1a5f2910f78ddf9d4c6c
+MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch
new file mode 100644
index 000000000000..6b176a6ecf64
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch
@@ -0,0 +1,20 @@
+--- ac_python_devel.m4.orig 2010-03-06 01:28:40.000000000 +0200
++++ ac_python_devel.m4 2010-03-06 01:29:47.000000000 +0200
+@@ -68,7 +68,7 @@
+ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+ Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+ to something else than an empty string.
+-])dnl
++])
+ else
+ AC_MSG_RESULT([skip at user request])
+ fi
+@@ -92,7 +92,7 @@
+ If you have it installed, but it isn't the default Python
+ interpreter in your system path, please pass the PYTHON_VERSION
+ variable to configure. See ``configure --help'' for reference.
+-])dnl
++])
+ fi
+ fi
+
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch
new file mode 100644
index 000000000000..6b38dc038c4a
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch
@@ -0,0 +1,12 @@
+diff -ur lcd4linux-0.10.1-RC2.orig/lcd4linux.c lcd4linux-0.10.1-RC2/lcdinux-0.10.1-RC2/lcd4linux.c
+--- lcd4linux.c 2007-03-22 15:10:41.000000000 +0900
++++ lcd4linux.c 2011-11-23 12:12:03.782869315 +0800
+@@ -26,7 +26,7 @@
+ */
+
+ #include "config.h"
+-
++#include <sys/stat.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch
new file mode 100644
index 000000000000..c3fa8ac36350
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch
@@ -0,0 +1,374 @@
+Patch for >=lcd4linux-0.10.1_rc2-r1
+
+Fixes memory and other bugs in plugin_mpd
+
+Accepted upstream
+
+Index: plugin_mpd.c
+===================================================================
+--- plugin_mpd.c (Revision 801)
++++ plugin_mpd.c (Arbeitskopie)
+@@ -4,6 +4,7 @@
+ * mpd informations
+ *
+ * Copyright (C) 2006 Stefan Kuhne <sk-privat@gmx.net>
++ * Copyright (C) 2007 Robert Buchholz <rbu@gentoo.org>
+ * Copyright (C) 2006 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ *
+ * This file is part of LCD4Linux.
+@@ -81,8 +82,8 @@
+
+ iport = strtol(port, &test, 10);
+
+- if (iport < 0 || *test != '\0') {
+- fprintf(stderr, "MPD_PORT \"%s\" is not a positive integer\n", port);
++ if ((iport < 0) || (*test != '\0')) {
++ error("[MPD] MPD_PORT \"%s\" is not a positive integer\n", port);
+ exit(EXIT_FAILURE);
+ }
+
+@@ -94,17 +95,16 @@
+ mpd_sendCommandListEnd(mpd.conn);
+
+ if ((mpd.status = mpd_getStatus(mpd.conn)) == NULL) {
+- fprintf(stderr, "%s\n", mpd.conn->errorStr);
++ error("[MPD] error when getting status: %s\n", mpd.conn->errorStr);
+ mpd_closeConnection(mpd.conn);
+- }
+-
+- if (mpd.status->error) {
+- printf("error: %s\n", mpd.status->error);
+- }
+-
+- if (mpd.conn->error) {
+- fprintf(stderr, "%s\n", mpd.conn->errorStr);
++ mpd.conn = NULL;
++ } else if (mpd.status->error) {
++ info("[MPD] status error when connecting: %s\n", mpd.status->error);
++ } else if (mpd.conn->error) {
++ error("[MPD] error when connecting: %s\n", mpd.conn->errorStr);
++ mpd_freeStatus(mpd.status);
+ mpd_closeConnection(mpd.conn);
++ mpd.conn = NULL;
+ }
+
+ return mpd;
+@@ -114,14 +114,15 @@
+ static void disconnect(struct Pointer mpd)
+ {
+ if (mpd.conn->error) {
+- fprintf(stderr, "%s\n", mpd.conn->errorStr);
++ error("[MPD] error when disconnecting: %s\n", mpd.conn->errorStr);
++ mpd_freeStatus(mpd.status);
+ mpd_closeConnection(mpd.conn);
++ return;
+ }
+
+ mpd_finishCommand(mpd.conn);
+ if (mpd.conn->error) {
+- fprintf(stderr, "%s\n", mpd.conn->errorStr);
+- mpd_closeConnection(mpd.conn);
++ error("[MPD] error when disconnecting: %s\n", mpd.conn->errorStr);
+ }
+
+ mpd_freeStatus(mpd.status);
+@@ -132,8 +133,12 @@
+
+ static void artist(RESULT * result, RESULT * query)
+ {
+- char *value = " ";
++ char *value = NULL;
+ struct Pointer mpd = connect();
++ if (mpd.conn == NULL) {
++ SetResult(&result, R_STRING, " ");
++ return;
++ }
+
+ mpd_nextListOkCommand(mpd.conn);
+
+@@ -145,9 +150,10 @@
+ continue;
+ }
+
+- if (song->artist) {
++ if (!value && song->artist) {
++ /* we found our first song */
+ value = strdup(song->artist);
+- //add comment
++ /* add comment */
+ if (query) {
+ char *myarg;
+ myarg = strdup(R2S(query));
+@@ -160,8 +166,8 @@
+
+ disconnect(mpd);
+
+- /* store result */
+- SetResult(&result, R_STRING, value);
++ /* store result, value must not be NULL */
++ SetResult(&result, R_STRING, value ? value : " ");
+
+ free(value);
+ }
+@@ -169,8 +175,12 @@
+
+ static void title(RESULT * result)
+ {
+- char *value = " ";
++ char *value = NULL;
+ struct Pointer mpd = connect();
++ if (mpd.conn == NULL) {
++ SetResult(&result, R_STRING, " ");
++ return;
++ }
+
+ mpd_nextListOkCommand(mpd.conn);
+
+@@ -182,7 +192,7 @@
+ continue;
+ }
+
+- if (song->title) {
++ if (!value && song->title) {
+ value = strdup(song->title);
+ }
+ mpd_freeInfoEntity(mpd.entity);
+@@ -190,8 +200,8 @@
+
+ disconnect(mpd);
+
+- /* store result */
+- SetResult(&result, R_STRING, value);
++ /* store result, value must not be NULL */
++ SetResult(&result, R_STRING, value ? value : " ");
+
+ free(value);
+ }
+@@ -199,8 +209,12 @@
+
+ static void album(RESULT * result)
+ {
+- char *value = " ";
++ char *value = NULL;
+ struct Pointer mpd = connect();
++ if (mpd.conn == NULL) {
++ SetResult(&result, R_STRING, " ");
++ return;
++ }
+
+ mpd_nextListOkCommand(mpd.conn);
+
+@@ -212,7 +226,7 @@
+ continue;
+ }
+
+- if (song->album) {
++ if (!value && song->album) {
+ value = strdup(song->album);
+ }
+ mpd_freeInfoEntity(mpd.entity);
+@@ -220,8 +234,8 @@
+
+ disconnect(mpd);
+
+- /* store result */
+- SetResult(&result, R_STRING, value);
++ /* store result, value must not be NULL */
++ SetResult(&result, R_STRING, value ? value : " ");
+
+ free(value);
+ }
+@@ -236,7 +250,7 @@
+ void error_callback( __attribute__ ((unused)) MpdObj * mi, int errorid, char *msg, __attribute__ ((unused))
+ void *userdata)
+ {
+- printf("Error %i: '%s'\n", errorid, msg);
++ info("[MPD] caught error %i: '%s'\n", errorid, msg);
+ }
+
+ static int mpd_get(int function)
+@@ -278,95 +292,89 @@
+
+ static void elapsedTime(RESULT * result)
+ {
+- char *value = " ";
++ char myTime[6] = " ";
+
+- int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
++ const int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
+
+- if (playTime != -1) {
+- char myTime[6];
+- memset(myTime, 0, 6);
+- int minutes = (int) (playTime / 60);
+- int seconds = (int) (playTime % 60);
++ if ((playTime >= 0) && (playTime < 6000)) {
++ const int minutes = (int) (playTime / 60);
++ const int seconds = (int) (playTime % 60);
+ sprintf(myTime, "%02d:%02d", minutes, seconds);
++ } else if (playTime >= 6000) {
++ strcpy(myTime, "LONG");
++ }
+
+- value = strdup(myTime);
+- }
+- // store result
+- SetResult(&result, R_STRING, value);
++ /* store result */
++ SetResult(&result, R_STRING, myTime);
+ }
+
+ static void elapsedTimeSec(RESULT * result)
+ {
+- int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
++ const int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
+ double d = 0.0;
+
+ if (playTime != -1)
+ d = playTime;
+
+- // store result
++ /* store result */
+ SetResult(&result, R_NUMBER, &d);
+ }
+
+ static void totalTime(RESULT * result)
+ {
+- char *value = " ";
++ char myTime[6] = "ERROR";
+
+- int totTime = mpd_get(_mpd_status_get_total_song_time);
+- if (totTime != -1) {
+- char myTime[6];
+- memset(myTime, 0, 6);
+- int minutes = (int) (totTime / 60);
+- int seconds = (int) (totTime % 60);
++ const int totTime = mpd_get(_mpd_status_get_total_song_time);
++ if ((totTime >= 0) && (totTime < 6000)) {
++ const int minutes = (int) (totTime / 60);
++ const int seconds = (int) (totTime % 60);
+ sprintf(myTime, "%02d:%02d", minutes, seconds);
++ } else if (totTime >= 6000) {
++ strcpy(myTime, "LONG");
++ }
+
+- value = strdup(myTime);
+- } else
+- value = strdup("ERROR");
+- // store result
+- SetResult(&result, R_STRING, value);
++ /* store result */
++ SetResult(&result, R_STRING, myTime);
+ }
+
+ static void totalTimeSec(RESULT * result)
+ {
+- int totTime = mpd_get(_mpd_status_get_total_song_time);
++ const int totTime = mpd_get(_mpd_status_get_total_song_time);
+ double d = 0.0;
+
+ if (totTime != -1)
+ d = totTime;
+
+- // store result
++ /* store result */
+ SetResult(&result, R_NUMBER, &d);
+ }
+
+ static void bitRate(RESULT * result)
+ {
+- char *value = "";
++ char rateStr[4];
+
+- int rate = mpd_get(_mpd_status_get_bitrate);
++ const int rate = mpd_get(_mpd_status_get_bitrate);
+
+- if (rate != -1) {
+- char rateStr[4];
+- memset(rateStr, 0, 4);
++ if ((rate >= 0) && (rate < 1000)) {
+ sprintf(rateStr, "%03d", rate);
++ }
+
+- value = strdup(rateStr);
+- }
+- // store result
+- SetResult(&result, R_STRING, value);
++ /* store result */
++ SetResult(&result, R_STRING, rateStr);
+ }
+
+ static void getRepeat(RESULT * result)
+ {
+ char *value = " ";
+
+- int rep = mpd_get(_mpd_player_get_repeat);
++ const int rep = mpd_get(_mpd_player_get_repeat);
+
+ if (rep != -1) {
+ if (rep)
+- value = strdup("REP");
+- // else value = strdup(" ");
++ value = "REP";
++ /* else value = strdup(" "); */
+ }
+- // store result
++ /* store result */
+ SetResult(&result, R_STRING, value);
+ }
+
+@@ -375,26 +383,26 @@
+ {
+ char *value = " ";
+
+- int ran = mpd_get(_mpd_player_get_random);
++ const int ran = mpd_get(_mpd_player_get_random);
+
+ if (ran != -1) {
+ if (ran)
+ value = strdup("RND");
+- // else value = strdup(" ");
++ /* else value = strdup(" "); */
+ }
+- // store result
++ /* store result */
+ SetResult(&result, R_STRING, value);
+ }
+
+ static void getRepRand(RESULT * result)
+ {
+- char *value = " ";
++ char str[9] = " ";
+
+- int ran = mpd_get(_mpd_player_get_random);
+- int rep = mpd_get(_mpd_player_get_repeat);
++ const int ran = mpd_get(_mpd_player_get_random);
++ const int rep = mpd_get(_mpd_player_get_repeat);
+
+ if (ran != -1 && rep != -1) {
+- char str[9];
++
+ if (rep)
+ sprintf(str, "REP/");
+ else
+@@ -403,17 +411,16 @@
+ sprintf(str, "%sRND", str);
+ else
+ sprintf(str, "%s---", str);
+- value = strdup(str);
+ }
+- // store result
+- SetResult(&result, R_STRING, value);
++ /* store result */
++ SetResult(&result, R_STRING, str);
+ }
+
+ int plugin_init_mpd(void)
+ {
+ /* Check for File */
+ if (mpd_get(_mpd_dummy) != 1) {
+- error("Error: Cannot connect to MPD! Is MPD started?");
++ error("[MPD] Error: Cannot connect to MPD! Is MPD started?");
+ return -1;
+ }
+
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch
new file mode 100644
index 000000000000..b25d01e8e901
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch
@@ -0,0 +1,187 @@
+kMessage-ID: <47011930.60100@reinelt.co.at>
+Date: Mon, 01 Oct 2007 17:58:40 +0200
+From: Michael Reinelt <michael@reinelt.co.at>
+Subject: [Lcd4linux-devel] asm/msr.h inclusion and RDTSC stuff removed
+
+Hi there,
+
+I just committed a changeset where I removed the whole RDTSC delay loop
+stuff, and therefore lcd4linux does no longer need asm/msr.h
+
+Instead, a gettimeofday() delay loop will be used when necessary.
+
+The rdtsc stuff worked fine, but had two major disadvantages: It did not
+work with variable CPU frequencies, and latest kernels do no longer
+offer the rdtsc() macro.
+
+The changeset has been committed to trunk, and will be backported to the
+0.10.1 branch as soon as I get some positive feedback 8or at least I
+don't get any negative feedback)
+
+
+bye, Michael
+
+--
+Michael Reinelt <michael@reinelt.co.at>
+http://home.pages.at/reinelt
+GPG-Key 0xDF13BA50
+ICQ #288386781
+
+Index: configure.in
+===================================================================
+--- lcd4linux-0.10.1-RC2/configure.in.orig
++++ lcd4linux-0.10.1-RC2/configure.in
+@@ -99,7 +99,6 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h])
+ AC_CHECK_HEADERS(sys/io.h asm/io.h)
+ AC_CHECK_HEADERS(linux/parport.h linux/ppdev.h)
+-AC_CHECK_HEADERS(asm/msr.h)
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+Index: udelay.c
+===================================================================
+--- lcd4linux-0.10.1-RC2/udelay.c.orig
++++ lcd4linux-0.10.1-RC2/udelay.c
+@@ -55,11 +55,6 @@
+ #include <string.h>
+ #include <sys/time.h>
+
+-#ifdef HAVE_ASM_MSR_H
+-#define u32 unsigned int
+-#include <asm/msr.h>
+-#endif
+-
+
+ #include "debug.h"
+ #include "cfg.h"
+@@ -67,79 +62,10 @@
+ #include "udelay.h"
+
+
+-static unsigned int ticks_per_usec = 0;
+-
+-
+-static void getCPUinfo(int *hasTSC, double *MHz)
+-{
+- int fd;
+- char buffer[4096], *p;
+-
+- *hasTSC = 0;
+- *MHz = -1;
+-
+- fd = open("/proc/cpuinfo", O_RDONLY);
+- if (fd == -1) {
+- error("udelay: open(/proc/cpuinfo) failed: %s", strerror(errno));
+- return;
+- }
+- if (read(fd, &buffer, sizeof(buffer) - 1) == -1) {
+- error("udelay: read(/proc/cpuinfo) failed: %s", strerror(errno));
+- close(fd);
+- return;
+- }
+- close(fd);
+-
+- p = strstr(buffer, "flags");
+- if (p == NULL) {
+- info("udelay: /proc/cpuinfo has no 'flags' line");
+- } else {
+- p = strstr(p, "tsc");
+- if (p == NULL) {
+- info("udelay: CPU does not support Time Stamp Counter");
+- } else {
+- info("udelay: CPU supports Time Stamp Counter");
+- *hasTSC = 1;
+- }
+- }
+-
+- p = strstr(buffer, "cpu MHz");
+- if (p == NULL) {
+- info("udelay: /proc/cpuinfo has no 'cpu MHz' line");
+- } else {
+- if (sscanf(p + 7, " : %lf", MHz) != 1) {
+- error("udelay: parse(/proc/cpuinfo) failed: unknown 'cpu MHz' format");
+- *MHz = -1;
+- } else {
+- info("udelay: CPU runs at %f MHz", *MHz);
+- }
+- }
+-
+-}
+-
+
+ void udelay_init(void)
+ {
+-#ifdef HAVE_ASM_MSR_H
+-
+- int tsc;
+- double mhz;
+-
+- getCPUinfo(&tsc, &mhz);
+-
+- if (tsc && mhz > 0.0) {
+- ticks_per_usec = ceil(mhz);
+- info("udelay: using TSC delay loop, %u ticks per microsecond", ticks_per_usec);
+- } else
+-#else
+- error("udelay: The file 'include/asm/msr.h' was missing at compile time.");
+- error("udelay: Even if your CPU supports TSC, it will not be used!");
+- error("udelay: You *really* should install msr.h and recompile LCD4linux!");
+-#endif
+- {
+- ticks_per_usec = 0;
+- info("udelay: using gettimeofday() delay loop");
+- }
++ info("udelay: using gettimeofday() delay loop");
+ }
+
+
+@@ -172,37 +98,17 @@ unsigned long timing(const char *driver,
+ void ndelay(const unsigned long nsec)
+ {
+
+-#ifdef HAVE_ASM_MSR_H
+-
+- if (ticks_per_usec) {
++ struct timeval now, end;
+
+- unsigned int t1, t2;
+- unsigned long tsc;
+-
+- tsc = (nsec * ticks_per_usec + 999) / 1000;
+-
+- rdtscl(t1);
+- do {
+- rep_nop();
+- rdtscl(t2);
+- } while ((t2 - t1) < tsc);
+-
+- } else
+-#endif
+-
+- {
+- struct timeval now, end;
+-
+- gettimeofday(&end, NULL);
+- end.tv_usec += (nsec + 999) / 1000;
+- while (end.tv_usec > 1000000) {
+- end.tv_usec -= 1000000;
+- end.tv_sec++;
+- }
+-
+- do {
+- rep_nop();
+- gettimeofday(&now, NULL);
+- } while (now.tv_sec == end.tv_sec ? now.tv_usec < end.tv_usec : now.tv_sec < end.tv_sec);
++ gettimeofday(&end, NULL);
++ end.tv_usec += (nsec + 999) / 1000;
++ while (end.tv_usec > 1000000) {
++ end.tv_usec -= 1000000;
++ end.tv_sec++;
+ }
++
++ do {
++ rep_nop();
++ gettimeofday(&now, NULL);
++ } while (now.tv_sec == end.tv_sec ? now.tv_usec < end.tv_usec : now.tv_sec < end.tv_sec);
+ }
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch
new file mode 100644
index 000000000000..6ecc7a248990
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch
@@ -0,0 +1,121 @@
+diff -crB lcd4linux-0.10.1-RC2-orig/drv_BWCT.c lcd4linux-0.10.1-RC2/drv_BWCT.c
+*** lcd4linux-0.10.1-RC2-orig/drv_BWCT.c 2007-02-25 13:39:09.000000000 +0100
+--- lcd4linux-0.10.1-RC2/drv_BWCT.c 2013-11-10 21:32:06.119047221 +0100
+***************
+*** 72,78 ****
+ static usb_dev_handle *lcd;
+ static int interface;
+
+- extern int usb_debug;
+ extern int got_signal;
+
+
+--- 72,77 ----
+***************
+*** 89,96 ****
+
+ info("%s: scanning USB for BWCT LCD...", Name);
+
+- usb_debug = 0;
+-
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+--- 88,93 ----
+diff -crB lcd4linux-0.10.1-RC2-orig/drv_LCD2USB.c lcd4linux-0.10.1-RC2/drv_LCD2USB.c
+*** lcd4linux-0.10.1-RC2-orig/drv_LCD2USB.c 2007-02-25 13:39:10.000000000 +0100
+--- lcd4linux-0.10.1-RC2/drv_LCD2USB.c 2013-11-10 21:32:15.686677498 +0100
+***************
+*** 98,104 ****
+ static usb_dev_handle *lcd;
+ static int controllers = 0;
+
+- extern int usb_debug;
+ extern int got_signal;
+
+ /****************************************/
+--- 98,103 ----
+***************
+*** 120,127 ****
+ if (device_id != NULL)
+ info("%s: scanning for device id: %s", Name, device_id);
+
+- usb_debug = 0;
+-
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+--- 119,124 ----
+diff -crB lcd4linux-0.10.1-RC2-orig/drv_picoLCD.c lcd4linux-0.10.1-RC2/drv_picoLCD.c
+*** lcd4linux-0.10.1-RC2-orig/drv_picoLCD.c 2007-02-25 13:39:10.000000000 +0100
+--- lcd4linux-0.10.1-RC2/drv_picoLCD.c 2013-11-10 21:32:30.102120440 +0100
+***************
+*** 75,81 ****
+ static char *BufPtr;
+
+ static usb_dev_handle *lcd;
+- extern int usb_debug;
+
+
+
+--- 75,80 ----
+***************
+*** 97,104 ****
+
+ info("%s: scanning for picoLCD...", Name);
+
+- usb_debug = 0;
+-
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+--- 96,101 ----
+diff -crB lcd4linux-0.10.1-RC2-orig/drv_Trefon.c lcd4linux-0.10.1-RC2/drv_Trefon.c
+*** lcd4linux-0.10.1-RC2-orig/drv_Trefon.c 2007-02-25 13:39:10.000000000 +0100
+--- lcd4linux-0.10.1-RC2/drv_Trefon.c 2013-11-10 21:32:46.441489039 +0100
+***************
+*** 72,78 ****
+ static usb_dev_handle *lcd;
+ static int interface;
+
+- extern int usb_debug;
+
+
+ /****************************************/
+--- 72,77 ----
+***************
+*** 88,95 ****
+
+ info("%s: scanning USB for TREFON LCD...", Name);
+
+- usb_debug = 0;
+-
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+--- 87,92 ----
+diff -crB lcd4linux-0.10.1-RC2-orig/drv_USBLCD.c lcd4linux-0.10.1-RC2/drv_USBLCD.c
+*** lcd4linux-0.10.1-RC2-orig/drv_USBLCD.c 2007-02-25 13:39:10.000000000 +0100
+--- lcd4linux-0.10.1-RC2/drv_USBLCD.c 2013-11-10 21:33:01.508906792 +0100
+***************
+*** 86,93 ****
+ static usb_dev_handle *lcd;
+ static int interface;
+
+- extern int usb_debug;
+-
+ #endif
+
+
+--- 86,91 ----
+***************
+*** 107,114 ****
+
+ info("%s: scanning for USBLCD...", Name);
+
+- usb_debug = 0;
+-
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+--- 105,110 ----
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch
new file mode 100644
index 000000000000..58791ee91ff7
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch
@@ -0,0 +1,64 @@
+Index: ./plugin_kvv.c
+===================================================================
+--- ./plugin_kvv.c (revision 771)
++++ ./plugin_kvv.c (revision 797)
+@@ -414,5 +414,5 @@
+
+ if (count > 0) {
+- char *input, *cookie, *name, *value;
++ char *input, *cookie, *name = NULL, *value = NULL;
+ int input_len, cookie_len, name_len, value_len;
+
+Index: ./plugin_mpd.c
+===================================================================
+--- ./plugin_mpd.c (revision 786)
++++ ./plugin_mpd.c (revision 797)
+@@ -65,5 +65,10 @@
+ int iport;
+ char *test;
+- struct Pointer mpd;
++
++ struct Pointer mpd = {
++ .conn = NULL,
++ .status = NULL,
++ .entity = NULL
++ };
+
+ if ((test = getenv("MPD_HOST"))) {
+@@ -229,5 +234,6 @@
+ #define _mpd_player_get_random 005
+
+-void error_callback(MpdObj * mi, int errorid, char *msg, void *userdata)
++void error_callback( __attribute__ ((unused)) MpdObj * mi, int errorid, char *msg, __attribute__ ((unused))
++ void *userdata)
+ {
+ printf("Error %i: '%s'\n", errorid, msg);
+Index: ./drv_Image.c
+===================================================================
+--- ./drv_Image.c (revision 771)
++++ ./drv_Image.c (revision 797)
+@@ -115,5 +115,5 @@
+ if (bitbuf == NULL) {
+ if ((bitbuf = malloc(xsize * ysize * sizeof(*bitbuf))) == NULL) {
+- error("%s: malloc(%d) failed: %s", Name, (int) xsize * ysize * sizeof(*bitbuf), strerror(errno));
++ error("%s: malloc() failed: %s", Name, strerror(errno));
+ return -1;
+ }
+@@ -122,5 +122,5 @@
+ if (rowbuf == NULL) {
+ if ((rowbuf = malloc(3 * xsize * sizeof(*rowbuf))) == NULL) {
+- error("Raster: malloc(%d) failed: %s", (int) 3 * xsize * sizeof(*rowbuf), strerror(errno));
++ error("Raster: malloc() failed: %s", strerror(errno));
+ return -1;
+ }
+Index: ./plugin_i2c_sensors.c
+===================================================================
+--- ./plugin_i2c_sensors.c (revision 771)
++++ ./plugin_i2c_sensors.c (revision 797)
+@@ -297,5 +297,5 @@
+ strcat(path_cfg, "/");
+ }
+- debug("using i2c sensors at %s (from %s)", path, cfg_source());
++ debug("using i2c sensors at %s (from %s)", path_cfg, cfg_source());
+ path = realloc(path, strlen(path_cfg) + 1);
+ strcpy(path, path_cfg);
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd
new file mode 100644
index 000000000000..1135ea3d588b
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/lcd4linux.pid
+DAEMON=/usr/bin/lcd4linux
+
+depend() {
+ use net
+}
+
+start() {
+ ebegin "Starting lcd4linux"
+ start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON}
+ eend $? "Failed to start lcd4linux. Did you remember to set up /etc/lcd4linux.conf?"
+}
+
+stop() {
+ ebegin "Stopping lcd4linux"
+ start-stop-daemon --stop --quiet --oknodo --exec ${DAEMON} --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/app-misc/lcd4linux/files/lcd4linux-r1.initd b/app-misc/lcd4linux/files/lcd4linux-r1.initd
new file mode 100644
index 000000000000..44ca73e9aabe
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-r1.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "lcd4linux" ]; then
+ config="/etc/lcd4linux/lcd4linux.conf"
+ name="LCD4Linux"
+ pidfile="/run/lcd4linux.pid"
+else
+ config="/etc/lcd4linux/lcd4linux.${SVCNAME#lcd4linux.}.conf"
+ name="LCD4Linux (${SVCNAME#lcd4linux.})"
+ pidfile="/run/lcd4linux.${SVCNAME#lcd4linux.}.pid"
+fi
+
+command="/usr/bin/lcd4linux"
+command_args="-f ${config} -p ${pidfile}"
+command_background="true"
+command_group="root"
+command_user="root"
+
+start_pre() {
+ if [ ! -f "${config}" ]; then
+ eerror "Please create ${config} before starting LCD4Linux!"
+ return 1
+ else
+ checkpath -f -m 600 -o "${command_user}:${command_group}" -q "${config}"
+ return 0
+ fi
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
new file mode 100644
index 000000000000..dd4dad81be11
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+WANT_AUTOMAKE="1.9"
+inherit eutils multilib autotools python-single-r1
+
+MY_P=${P/_rc/-RC}
+
+DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="mysql python iconv mpd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
+ ea232 g15 hd44780 hd44780i2c lcd2usb
+ lcdlinux lcdterm ledmatrix lph7508 m50530
+ mtxorb milfordbpk noritake null picolcd
+ png ppm routerboard serdisplib simplelcd
+ t6963 trefon usbhub usblcd wincor
+ X luise)
+
+# Iterate through the array and add the lcd_devices_* that we support
+NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
+index=0
+while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[$index]}"
+ let "index = ${index} + 1"
+done
+
+DEPEND="
+ mysql? ( virtual/mysql )
+ iconv? ( virtual/libiconv )
+ mpd? ( media-libs/libmpd )
+
+ lcd_devices_bwct? ( =virtual/libusb-0* )
+ lcd_devices_g15? ( =virtual/libusb-0* )
+ lcd_devices_lcd2usb? ( =virtual/libusb-0* )
+ lcd_devices_picolcd? ( =virtual/libusb-0* )
+ lcd_devices_trefon? ( =virtual/libusb-0* )
+ lcd_devices_usbhub? ( =virtual/libusb-0* )
+ lcd_devices_usblcd? ( =virtual/libusb-0* )
+ lcd_devices_luise? ( dev-libs/luise-bin )
+ lcd_devices_ncurses? ( sys-libs/ncurses:0= )
+ lcd_devices_noritake? ( media-libs/gd )
+ lcd_devices_t6963? ( media-libs/gd )
+ lcd_devices_png? ( media-libs/libpng:0= media-libs/gd )
+ lcd_devices_X? ( x11-libs/libX11 media-libs/gd )
+ lcd_devices_serdisplib? ( dev-libs/serdisplib media-libs/gd )
+"
+RDEPEND="${DEPEND}
+ python? ( ${PYTHON_DEPS} )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ elog "If you wish to compile only specific plugins, please use"
+ elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
+ elog "apm cpuinfo diskstats dvb exec file i2c_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-warnings.patch"
+ epatch "${FILESDIR}/${P}-mpd.patch"
+ epatch "${FILESDIR}/${P}-nordtsc.patch"
+ epatch "${FILESDIR}/${P}-autoconf-2.65.patch"
+ epatch "${FILESDIR}/${P}-missing-header.patch"
+ epatch "${FILESDIR}/${P}-usbdebug.patch"
+ eautoreconf
+}
+
+src_configure() {
+ # This array contains the driver names required by configure --with-drivers=
+ # The positions must be the same as the corresponding use_expand flags
+ local DEVICE_DRIVERS=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
+ EA232graphic G15 HD44780 HD44780-I2C LCD2USB
+ LCDLinux LCDTerm LEDMatrix LPH7508 M50530
+ MatrixOrbital MilfordInstruments Noritake NULL picoLCD
+ PNG PPM RouterBoard serdisplib SimpleLCD
+ T6963 Trefon USBHUB USBLCD WincorNixdorf
+ X11 LUIse)
+
+ local myconf myp
+
+ # plugins
+ if [ -n "$LCD4LINUX_PLUGINS" ]; then
+ myp="$LCD4LINUX_PLUGINS"
+ else
+ myp="all,!xmms"
+ fi
+ use iconv || myp="${myp},!iconv"
+ use mpd || myp="${myp},!mpd"
+ use mysql || myp="${myp},!mysql"
+ use python || myp="${myp},!python"
+ elog "Active plugins: ${myp}"
+
+ # Generate comma separated list of drivers
+ local COMMA_DRIVERS
+ local FIRST_DRIVER
+ local index=0
+ local driver
+
+ while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ if use "lcd_devices_${IUSE_LCD_DEVICES[$index]}" ; then
+ driver=${DEVICE_DRIVERS[$index]}
+ if [ -z ${COMMA_DRIVERS} ] ; then
+ # First in the list
+ COMMA_DRIVERS="${driver}"
+ FIRST_DRIVER="${driver}"
+ else
+ # Second, third, ... include a comma at the front
+ COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
+ fi
+ fi
+ let "index = ${index} + 1"
+ done
+
+ # activate at least one driver
+ if [ -z ${COMMA_DRIVERS} ] ; then
+ COMMA_DRIVERS="NULL"
+ fi
+
+ # workaround the build failing because of b0rked settings
+ if use lcd_devices_hd44780 && use lcd_devices_hd44780i2c ; then
+ echo
+ ewarn "Disabling hd44780 LCD_DEVICE as hd44780i2c is set!"
+ echo
+ COMMA_DRIVERS="${COMMA_DRIVERS},!HD44780"
+ fi
+
+ # avoid package brokenness
+ if use lcd_devices_X ; then
+ myconf="--x-libraries=/usr/$(get_libdir) --x-include=/usr/include"
+ else
+ myconf="--without-x"
+ fi
+
+ econf \
+ --sysconfdir=/etc/lcd4linux \
+ --with-drivers="${COMMA_DRIVERS}" \
+ --with-plugins="${myp}" \
+ $(use_with python) \
+ ${myconf}
+
+ sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}/${P}.initd" ${PN}
+
+ insinto /etc
+ insopts -o root -g root -m 0600
+ newins lcd4linux.conf.sample lcd4linux.conf
+}
+
+pkg_postinst() {
+ if use lcd_devices_lcdlinux; then
+ ewarn "To actually use the lcd-linux devices, you will need to install the lcd-linux kernel module."
+ ewarn "You can either do that yourself, see http://lcd-linux.sf.net or "
+ ewarn "checkout https://overlays.gentoo.org/dev/jokey/browser/trunk and emerge app-misc/lcd-linux"
+ fi
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
new file mode 100644
index 000000000000..098e0b9b1d05
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205, which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=( ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+ FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+ MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+ PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+ SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11 )
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=( apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
+ fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
+ loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
+ proc_stat python qnaplog raspi sample statfs uname uptime
+ w1retap wireless )
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+ LCD_DEVICE=${LCD_DEVICE,,}
+ IUSE+=" lcd_devices_${LCD_DEVICE} "
+ REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="lcd_devices_astusb? ( virtual/libusb:0= )
+ lcd_devices_bwct? ( virtual/libusb:0= )
+ lcd_devices_curses? ( sys-libs/ncurses:0= )
+ lcd_devices_dpf? ( virtual/libusb:0= )
+ lcd_devices_g15? ( virtual/libusb:0= )
+ lcd_devices_glcd2usb? ( virtual/libusb:0= )
+ lcd_devices_irlcd? ( virtual/libusb:0= )
+ lcd_devices_lcd2usb? ( virtual/libusb:0= )
+ lcd_devices_ledmatrix? ( virtual/libusb:0= )
+ lcd_devices_luise? ( dev-libs/luise-bin
+ virtual/libusb:0= )
+ lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+ lcd_devices_mdm166a? ( virtual/libusb:0= )
+ lcd_devices_picolcd? ( virtual/libusb:0= )
+ lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+ lcd_devices_png? ( media-libs/gd[png]
+ media-libs/libpng:0= )
+ lcd_devices_ppm? ( media-libs/gd )
+ lcd_devices_samsungspf? ( virtual/libusb:0= )
+ lcd_devices_serdisplib? ( dev-libs/serdisplib )
+ lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+ lcd_devices_trefon? ( virtual/libusb:0= )
+ lcd_devices_ula200? ( dev-embedded/libftdi:1=
+ virtual/libusb:0= )
+ lcd_devices_usbhub? ( virtual/libusb:0= )
+ lcd_devices_usblcd? ( virtual/libusb:0= )
+ lcd_devices_vnc? ( net-libs/libvncserver )
+ lcd_devices_x11? ( x11-libs/libX11 )"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="asterisk? ( net-misc/asterisk )
+ dbus? ( sys-apps/dbus )
+ gps? ( dev-libs/nmeap )
+ hddtemp? ( app-admin/hddtemp )
+ iconv? ( virtual/libiconv )
+ mpd? ( media-libs/libmpd )
+ mpris_dbus? ( sys-apps/dbus )
+ mysql? ( || ( dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c ) )
+ python? ( ${PYTHON_DEPS} )
+ wireless? ( || ( net-wireless/iw
+ net-wireless/wireless-tools ) )"
+
+RDEPEND="dmalloc? ( dev-libs/dmalloc )
+ ${DEPEND_LCD_DEVICES}
+ ${DEPEND_LCD4LINUX_PLUGINS}"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Enable all users enabled lcd devices
+ local myeconfargs_lcd_devices
+ for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+ if use "lcd_devices_${lcd_device,,}"; then
+ myeconfargs_lcd_devices+=",${lcd_device}"
+ fi
+ done
+
+ # Enable all users enabled lcd4linux plugins
+ local myeconfargs_lcd4linux_plugins
+ for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+ if use "${lcd4linux_plugin}"; then
+ myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
+ fi
+ done
+
+ local myeconfargs=(
+ --disable-rpath
+ $(use_with dmalloc)
+ $(use_with outb)
+ $(use_with python)
+ $(use_with lcd_devices_x11 x)
+ --with-drivers="${myeconfargs_lcd_devices#,}"
+ --with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+ --x-include="/usr/include"
+ --x-libraries="/usr/$(get_libdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # Install sample config, and must have 600, as lcd4linux checks this.
+ insinto /etc/lcd4linux
+ insopts -m 0600
+ doins lcd4linux.conf.sample
+
+ newinitd "${FILESDIR}/lcd4linux-r1.initd" lcd4linux
+}
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
new file mode 100644
index 000000000000..a359d32d1f1e
--- /dev/null
+++ b/app-misc/lcd4linux/metadata.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ LCD4Linux is a small program that grabs information from the kernel
+ and some subsystems and displays it on an external liquid crystal display.
+ </longdescription>
+ <use>
+ <flag name="apm">Enable the APM plugin.</flag>
+ <flag name="asterisk">Enable the Asterisk plugin.</flag>
+ <flag name="button_exec">Enable the Button plugin, to execute something on keypress.</flag>
+ <flag name="cpuinfo">Enable the cpuinfo plugin.</flag>
+ <flag name="dbus">Enable the dbus plugin.</flag>
+ <flag name="diskstats">Enable the diskstats plugin.</flag>
+ <flag name="dmalloc">Enable dmalloc for debugging.</flag>
+ <flag name="dvb">Enable support for the DVB plugin.</flag>
+ <flag name="event">Enable the event plugin.</flag>
+ <flag name="exec">Enable the exec plugin, to read output from external programs.</flag>
+ <flag name="fifo">Enable the FIFO (First-In, First-Out) plugin.</flag>
+ <flag name="file">Enable the file plugin, to read from input from files.</flag>
+ <flag name="gps">Enable the gps plugin, for reading gps coordinates.</flag>
+ <flag name="hddtemp">Enable the hddtemp plugin, to read from the hddtemp daemon.</flag>
+ <flag name="huawei">Enable the huawei plugin, to read from a huawei device.</flag>
+ <flag name="i2c_sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
+ <flag name="iconv">Enable the iconv plugin, to convert between encodings.</flag>
+ <flag name="isdn">Enable the isdn plugin, to get information about ISDN.</flag>
+ <flag name="kvv">Enable the kvv plugin, to get realtime train schedule from the Karlsruher Verkehrsverbund.</flag>
+ <flag name="loadavg">Enable the loadavg plugin, to get stats load</flag>
+ <flag name="meminfo">Enable the meminfo plugin, to get memory statistics.</flag>
+ <flag name="mpd">Enable the mpd plugin, to read from the Music Player Daemon.</flag>
+ <flag name="mpris_dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
+ <flag name="mysql">Enable the mysql plugin, to get mysql database information.</flag>
+ <flag name="netdev">Enable the netdev plugin, to get interface statistics.</flag>
+ <flag name="netinfo">Enable the netinfo plugin, to get more interface statistic.</flag>
+ <flag name="outb">Enable raw i/o access.</flag>
+ <flag name="pop3">Enable the pop3 plugin, to get notified about new mails.</flag>
+ <flag name="proc_stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
+ <flag name="python">Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.</flag>
+ <flag name="qnaplog">Enable the qnaplog plugin, to read a log from a QNAP device.</flag>
+ <flag name="raspi">Enable the raspi plugin, to read sensor data from a Raspberry Pi.</flag>
+ <flag name="sample">Enable the sample plugin.</flag>
+ <flag name="statfs">Enable the statfs plugin, to get statistics about the file system.</flag>
+ <flag name="uname">Enable the uname plugin, to get the output of uname.</flag>
+ <flag name="uptime">Enable the uptime plugin.</flag>
+ <flag name="w1retap">Enable the w1retap plugin.</flag>
+ <flag name="wireless">Enable the wireless plugin, to get wireless statistics.</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/lcdproc-0.5.2-r1 b/app-misc/lcdproc-0.5.2-r1
deleted file mode 100644
index abb7ce22f660..000000000000
--- a/app-misc/lcdproc-0.5.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=usb? ( =virtual/libusb-0* ) lirc? ( app-misc/lirc ) irman? ( media-libs/libirman ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) lcd_devices_g15? ( dev-libs/libg15 >=dev-libs/libg15render-1.1.1 ) lcd_devices_ncurses? ( sys-libs/ncurses ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( >=dev-embedded/libftdi-0.7 =dev-embedded/libftdi-0* =virtual/libusb-0* ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( =virtual/libusb-0* ) lcd_devices_cwlinux? ( =virtual/libusb-0* ) lcd_devices_pyramid? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) doc? ( app-text/xmlto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Client/Server suite to drive all kinds of LCD (-like) devices
-EAPI=0
-HOMEPAGE=http://lcdproc.org/
-IUSE=doc debug nfs samba seamless-hbars usb lirc irman joystick lcd_devices_ncurses lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontz633 lcd_devices_cfontzpacket lcd_devices_cwlinux lcd_devices_eyeboxone lcd_devices_g15 lcd_devices_graphlcd lcd_devices_glk lcd_devices_hd44780 lcd_devices_icpa106 lcd_devices_imon lcd_devices_iowarrior lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_md8800 lcd_devices_ms6931 lcd_devices_mtcs16209x lcd_devices_mtxorb lcd_devices_noritakevfd lcd_devices_pyramid lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialvfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_svga lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_xosd lcd_devices_ea65 lcd_devices_picolcd lcd_devices_serialpos
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=usb? ( =virtual/libusb-0* ) lirc? ( app-misc/lirc ) irman? ( media-libs/libirman ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) lcd_devices_g15? ( dev-libs/libg15 >=dev-libs/libg15render-1.1.1 ) lcd_devices_ncurses? ( sys-libs/ncurses ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( >=dev-embedded/libftdi-0.7 =dev-embedded/libftdi-0* =virtual/libusb-0* ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( =virtual/libusb-0* ) lcd_devices_cwlinux? ( =virtual/libusb-0* ) lcd_devices_pyramid? ( =virtual/libusb-0* ) lcd_devices_picolcd? ( =virtual/libusb-0* ) lcd_devices_g15? ( app-misc/g15daemon )
-SLOT=0
-SRC_URI=mirror://sourceforge/lcdproc/lcdproc-0.5.2.tar.gz mirror://gentoo/lcdproc-0.5.2-patches.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d78a2f87f7bd7152b64b5018c8c187fe
diff --git a/app-misc/lcdproc-0.5.5 b/app-misc/lcdproc-0.5.5
deleted file mode 100644
index 3a3183d7283b..000000000000
--- a/app-misc/lcdproc-0.5.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=usb? ( virtual/libusb:0 ) ftdi? ( dev-embedded/libftdi:0 ) lirc? ( app-misc/lirc ) irman? ( media-libs/libirman ) hid? ( >=dev-libs/libhid-0.2.16 ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) lcd_devices_g15? ( dev-libs/libg15 dev-libs/libg15render ) lcd_devices_ncurses? ( sys-libs/ncurses ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( dev-embedded/libftdi:0 ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( virtual/libusb:0 ) lcd_devices_cwlinux? ( virtual/libusb:0 ) lcd_devices_pyramid? ( virtual/libusb:0 ) lcd_devices_picolcd? ( virtual/libusb:0 ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:0 ) lcd_devices_lis? ( dev-embedded/libftdi:0 virtual/libusb:0 ) lcd_devices_shuttlevfd? ( virtual/libusb:0 ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.5 )
-DESCRIPTION=Client/Server suite to drive all kinds of LCD (-like) devices
-EAPI=4
-HOMEPAGE=http://lcdproc.org/
-IUSE=doc debug hid nfs samba seamless-hbars usb lirc irman joystick ftdi lcd_devices_ncurses lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontz633 lcd_devices_cfontzpacket lcd_devices_cwlinux lcd_devices_eyeboxone lcd_devices_g15 lcd_devices_graphlcd lcd_devices_glk lcd_devices_hd44780 lcd_devices_icpa106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtcs16209x lcd_devices_mtxorb lcd_devices_noritakevfd lcd_devices_pyramid lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialvfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_SureElec lcd_devices_svga lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_xosd lcd_devices_ea65 lcd_devices_picolcd lcd_devices_serialpos lcd_devices_i2500vfd lcd_devices_irtrans lcd_devices_lis lcd_devices_shuttlevfd
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=usb? ( virtual/libusb:0 ) ftdi? ( dev-embedded/libftdi:0 ) lirc? ( app-misc/lirc ) irman? ( media-libs/libirman ) hid? ( >=dev-libs/libhid-0.2.16 ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver ) lcd_devices_g15? ( dev-libs/libg15 dev-libs/libg15render ) lcd_devices_ncurses? ( sys-libs/ncurses ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( dev-embedded/libftdi:0 ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( virtual/libusb:0 ) lcd_devices_cwlinux? ( virtual/libusb:0 ) lcd_devices_pyramid? ( virtual/libusb:0 ) lcd_devices_picolcd? ( virtual/libusb:0 ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:0 ) lcd_devices_lis? ( dev-embedded/libftdi:0 virtual/libusb:0 ) lcd_devices_shuttlevfd? ( virtual/libusb:0 ) lcd_devices_g15? ( app-misc/g15daemon )
-REQUIRED_USE=lcd_devices_mdm166a? ( hid )
-SLOT=0
-SRC_URI=mirror://sourceforge/lcdproc/lcdproc-0.5.5.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=78f3f1dfe770a10c2c17d1558467a882
diff --git a/app-misc/lcdproc-0.5.6-r1 b/app-misc/lcdproc-0.5.6-r1
deleted file mode 100644
index 4aba6b74c607..000000000000
--- a/app-misc/lcdproc-0.5.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ftdi? ( dev-embedded/libftdi:0 ) hid? ( >=dev-libs/libhid-0.2.16 ) irman? ( media-libs/libirman ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:0 ) truetype? ( media-libs/freetype:2 ) usb? ( virtual/libusb:0 ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver dev-libs/serdisplib ) lcd_devices_g15? ( dev-libs/libg15 dev-libs/libg15render ) lcd_devices_ncurses? ( sys-libs/ncurses:= ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( dev-embedded/libftdi:0 ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( virtual/libusb:0 ) lcd_devices_cwlinux? ( virtual/libusb:0 ) lcd_devices_pyramid? ( virtual/libusb:0 ) lcd_devices_picolcd? ( virtual/libusb:0 ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:0 ) lcd_devices_lis? ( dev-embedded/libftdi:0 virtual/libusb:0 ) lcd_devices_shuttlevfd? ( virtual/libusb:0 ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.5 )
-DESCRIPTION=Client/Server suite to drive all kinds of LCD (-like) devices
-EAPI=5
-HOMEPAGE=http://lcdproc.org/
-IUSE=debug doc ftdi hid irman joystick lirc nfs png samba seamless-hbars truetype usb lcd_devices_ncurses lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_cwlinux lcd_devices_eyeboxone lcd_devices_g15 lcd_devices_graphlcd lcd_devices_glk lcd_devices_hd44780 lcd_devices_icpa106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtcs16209x lcd_devices_mtxorb lcd_devices_noritakevfd lcd_devices_pyramid lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialvfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_SureElec lcd_devices_svga lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_ea65 lcd_devices_picolcd lcd_devices_serialpos lcd_devices_i2500vfd lcd_devices_irtrans lcd_devices_lis lcd_devices_shuttlevfd
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) hid? ( >=dev-libs/libhid-0.2.16 ) irman? ( media-libs/libirman ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:0 ) truetype? ( media-libs/freetype:2 ) usb? ( virtual/libusb:0 ) lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver dev-libs/serdisplib ) lcd_devices_g15? ( dev-libs/libg15 dev-libs/libg15render ) lcd_devices_ncurses? ( sys-libs/ncurses:= ) lcd_devices_svga? ( media-libs/svgalib ) lcd_devices_ula200? ( dev-embedded/libftdi:0 ) lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext ) lcd_devices_cfontzpacket? ( virtual/libusb:0 ) lcd_devices_cwlinux? ( virtual/libusb:0 ) lcd_devices_pyramid? ( virtual/libusb:0 ) lcd_devices_picolcd? ( virtual/libusb:0 ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:0 ) lcd_devices_lis? ( dev-embedded/libftdi:0 virtual/libusb:0 ) lcd_devices_shuttlevfd? ( virtual/libusb:0 ) lcd_devices_g15? ( app-misc/g15daemon )
-REQUIRED_USE=lcd_devices_mdm166a? ( hid )
-SLOT=0
-SRC_URI=mirror://sourceforge/lcdproc/lcdproc-0.5.6.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d8080215041e28e231db5eefdb7dfb23
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
new file mode 100644
index 000000000000..4898e52079d3
--- /dev/null
+++ b/app-misc/lcdproc/Manifest
@@ -0,0 +1,11 @@
+AUX 0.5.1-LCDd.initd 533 BLAKE2B 65263278bb7bd6cbba7d4c599cefd3735dd5d16ad0d56c130cf035286c7fe6d19c546d43662a513e73eeeaae154f6f24aecd534531e960cf67c6cade635bc8b0 SHA512 66e6ac519ca9919dc1321cdfbac3c8a54be681f534dcdfd06b5ec90c859a14694c6a6925983c3be58f2aa8d6391028fd8d978d7641710a23394ae87dca892900
+AUX 0.5.1-lcdproc.initd 364 BLAKE2B 62cae56b4e7093e7866a3f0f4d64d949930566f4434fb9dc1d6fc104b793f7d4762c3697409de429e8cb73aa0b6ed3cdaa05195acfc594eb25ac61aa47aec7e7 SHA512 4dce2d2e3d18c8fb57c7a84b2f9b7c67b8721e751af1a79fe60107a1559baacbf3531d5a495f68dd2ed890f9dd6d1834b51363e9ae96b606245bd2dc72680e34
+AUX 0.5.2-r2-lcdproc.initd 382 BLAKE2B 9e050b785119e23a749f52a893d2672cab608e7a5881319e1dc230e77ad9ce647f7258d86a8a710aebaf3de94fb691c1e974c21b2445453cd6bd5ca3c0ae3bec SHA512 9dc7667af52a2e95a28ee07c7646a124b46019643df19becc8f129da553a70b40c534b6c73057c73238efd232e98f02372d55a92135fccd9c297d776c53d3767
+DIST lcdproc-0.5.2-patches.tar.gz 6571 BLAKE2B 11cc34b39ceed329ba1aa9d0750a5c90dc0ff33f0650a3e285fd534b54928dc5f6d93854e530c249ed61fa1dde2cd369b32df82dbcb6c4ab3e6d1844672a5692 SHA512 d872099e524ed99525b642783d413f0cbff68aceb30857a4b7078390be9f98aa3acfa23c72e4455802376bc1bedb20019fa8a79e97066e2a1e97b5d68fbcd975
+DIST lcdproc-0.5.2.tar.gz 822695 BLAKE2B f7065c2d6ee1c6305d3682166bb2b4920a9f0ac2a079b57389f76edf75c81fa9ebe954358b216dbad866e2daa10f95857106e125cc54a9207a98553f408ae77b SHA512 e21a1f2d3d5f53aa09477e9aea1f9685c1fe224a8f79f15d0d032214de211c51619a9eea9183743c024859349d481fe35d7999cc51e0de81dc2fa8e0c85d7a5d
+DIST lcdproc-0.5.5.tar.gz 946206 BLAKE2B eb9e1248e84d4c9352a39991a1125e74cbfee9094d19a75da4298811120fcf2ef8fef056b35873b6308af79f92eb9187e504f43c4b28c07ca402de2c5d8fdc97 SHA512 42500188adb018547db4db4a472dded478a03f19974843865e07a466870fbca409b4259b57366b7dfdd4a5fd444a89c1930032d1127ae036128dbd9279a24b29
+DIST lcdproc-0.5.6.tar.gz 998996 BLAKE2B 022ce656390caea0c9394ca7a5458f7285e2655f53c49f6fa7d9f94c0638f9f97cc70af66bb779a6b7ca8024b70c2865d51719b72918a4a7da3f6af7d4451976 SHA512 7c506b4691c8544855dadf939863672230c3e0903bbe4bbde82df04ff932f818cdc406c5b159554ec155d0c46fff23d435121298f4e19bac73658b121c6b8220
+EBUILD lcdproc-0.5.2-r1.ebuild 5511 BLAKE2B eaa3431092a1e7794f24b7905e1c6c61a9d268179dfb093bd17a99aeb9a80a88ad9569a29ab8126db6bfeccd54369cce46513a3b625d15e8cdb7c9bc7003a7de SHA512 8a97517fa76ff856a7b56266efd77be52c269c1e651d7ff2bf836554be7bac84db3e0021d18a73592dfcb054a99f9efe7ca4de11f683d59f6a829523aae3f684
+EBUILD lcdproc-0.5.5.ebuild 5888 BLAKE2B 05f74abb99fba00d7cc2b2d633d0c41a743fe0537426b4997970d7fb2df1c89c5bb18e00ae24b7979a51de365f761672516ee266a6b570ed15deec484a8c8403 SHA512 3141859061d9a3d46814e361022c017ad1fab8eb92cad8a3561f371d03eef033908bd5d85391da5aa7a445309006a998699e2e5e412025ca074df5fd0f5ce130
+EBUILD lcdproc-0.5.6-r1.ebuild 6083 BLAKE2B 6d2a29febe9e6ba72fc254fb6d7c34f850dcf5b87f2115d01713b1eeac3b91b0e9004e2306b56774fe64cdbb261822dae08f50490d756a3f7cd2c58c9f52c006 SHA512 b18c7ccd63592c303081500055ada6e08c408002e0ed52e4a14fd6b799d0c70566104380eeaf1422fab424a9a68176fd37dcb2f99d614efb72587711476cd738
+MISC metadata.xml 1423 BLAKE2B b5f4d4202cc8178d0ddb4ace19592e15c5bdd68cd0239a219b866d3b6f7e404110858eadb81a7bbd456bc1db237754edfcf7bd9966a76755a81e4b5742712d7c SHA512 b62797738fd47a23fd83c31a027b1636374183488075e9c2073419ca6c08960c60d0bc6108c7148a144852dd45cad5ddd457879249331426f9594fac43cef306
diff --git a/app-misc/lcdproc/files/0.5.1-LCDd.initd b/app-misc/lcdproc/files/0.5.1-LCDd.initd
new file mode 100644
index 000000000000..9cc32667eb94
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.1-LCDd.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use net
+ use g15daemon
+}
+
+start() {
+ ebegin "Starting LCDd"
+ start-stop-daemon --start --quiet -m --pidfile /var/run/LCDd.pid \
+ --background --exec /usr/sbin/LCDd -- -s 1 -f
+ eend $? "Failed to start LCDd. Did you remember to set a driver in /etc/LCDd.conf? See syslog for details."
+}
+
+stop() {
+ ebegin "Stopping LCDd"
+ start-stop-daemon --stop --quiet --pidfile /var/run/LCDd.pid
+ eend $?
+}
diff --git a/app-misc/lcdproc/files/0.5.1-lcdproc.initd b/app-misc/lcdproc/files/0.5.1-lcdproc.initd
new file mode 100644
index 000000000000..ab23fb806efd
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.1-lcdproc.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend(){
+ use LCDd
+}
+
+start() {
+ ebegin "Starting lcdproc"
+ start-stop-daemon --start --background \
+ --exec /usr/bin/lcdproc
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lcdproc"
+ start-stop-daemon --stop --exec /usr/bin/lcdproc
+ eend $?
+}
diff --git a/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd b/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
new file mode 100644
index 000000000000..2e00eb86bdd8
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend(){
+ use LCDd
+ after ntp-client
+}
+
+start() {
+ ebegin "Starting lcdproc"
+ start-stop-daemon --start --background \
+ --exec /usr/bin/lcdproc
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lcdproc"
+ start-stop-daemon --stop --exec /usr/bin/lcdproc
+ eend $?
+}
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..9dfadf6234ce
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+WANT_AUTOMAKE="1.9"
+inherit eutils autotools multilib
+
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://gentoo/${P}-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+IUSE="doc debug nfs samba seamless-hbars usb lirc irman joystick"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
+ cwlinux eyeboxone g15 graphlcd glk
+ hd44780 icpa106 imon iowarrior
+ lb216 lcdm001 lcterm
+ md8800 ms6931 mtcs16209x mtxorb noritakevfd
+ pyramid sed1330 sed1520 serialvfd sli
+ stv5730 svga t6963 text tyan
+ ula200 xosd ea65 picolcd serialpos )
+
+# Iterate through the array and add the lcd_devices_* that we support
+NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
+index=0
+while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
+ let "index = ${index} + 1"
+done
+
+RDEPEND="
+ usb? ( =virtual/libusb-0* )
+ lirc? ( app-misc/lirc )
+ irman? ( media-libs/libirman )
+
+ lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver )
+ lcd_devices_g15? ( dev-libs/libg15 >=dev-libs/libg15render-1.1.1 )
+ lcd_devices_ncurses? ( sys-libs/ncurses )
+ lcd_devices_svga? ( media-libs/svgalib )
+ lcd_devices_ula200? ( >=dev-embedded/libftdi-0.7 =dev-embedded/libftdi-0* =virtual/libusb-0* )
+ lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext )
+ lcd_devices_cfontzpacket? ( =virtual/libusb-0* )
+ lcd_devices_cwlinux? ( =virtual/libusb-0* )
+ lcd_devices_pyramid? ( =virtual/libusb-0* )
+ lcd_devices_picolcd? ( =virtual/libusb-0* )"
+DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto )"
+RDEPEND="${RDEPEND}
+ lcd_devices_g15? ( app-misc/g15daemon )"
+
+pkg_setup() {
+ if [ -n "${LCDPROC_DRIVERS}" ] ; then
+ ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
+ ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${WORKDIR}/${P}-patches/${PV}-picolcd.patch"
+
+ sed -i "79s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf
+ einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
+
+ eautoreconf
+}
+
+src_compile() {
+ # This array contains the driver names required by configure --with-drivers=
+ # The positions must be the same as the corresponding use_expand flags
+ local DEVICE_DRIVERS=(curses bayrad CFontz CFontz633 CFontzPacket
+ CwLnx EyeboxOne g15 glcdlib glk
+ hd44780 icp_a106 imon IOWarrior
+ lb216 lcdm001 lcterm
+ MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD
+ pyramid sed1330 sed1520 serialVFD sli
+ stv5730 svga t6963 text tyan
+ ula200 xosd ea65 picolcd serialPOS)
+
+ # Generate comma separated list of drivers
+ COMMA_DRIVERS=""
+ FIRST_DRIVER=""
+ local index=0
+
+ while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
+ append-driver "${DEVICE_DRIVERS[${index}]}"
+ fi
+ let "index = ${index} + 1"
+ done
+
+ # Append the not-lcd-drivers (input)
+ use lirc && append-driver "lirc"
+ use irman && append-driver "irman"
+ use joystick && append-driver "joy"
+
+ if [ -z "${COMMA_DRIVERS}" ] ; then
+ ewarn "You are compiling LCDd without support for any LCD drivers at all."
+ else
+ # Patch the config to contain a driver that is actually installed instead of the default
+ elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
+ elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
+ sed -i "44s:curses:${FIRST_DRIVER}:" LCDd.conf
+ fi
+
+ local ENABLEUSB
+ if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid; then
+ ENABLEUSB="--enable-libusb"
+ else
+ ENABLEUSB="$(use_enable usb libusb)"
+ fi
+
+ econf \
+ $(use_enable debug) \
+ $(use_enable nfs stat-nfs) \
+ $(use_enable samba stat-smbfs ) \
+ $(use_enable seamless-hbars) \
+ ${ENABLEUSB} \
+ "--enable-drivers=${COMMA_DRIVERS}" \
+ || die "configure failed"
+
+ emake || die "make failed"
+
+ if use doc; then
+ ebegin "Creating user documentation"
+ cd "${S}"/docs/lcdproc-user
+ xmlto html --skip-validation lcdproc-user.docbook
+ eend $?
+
+ ebegin "Creating dev documentation"
+ cd "${S}"/docs/lcdproc-dev
+ xmlto html --skip-validation lcdproc-dev.docbook
+ eend $?
+ fi
+}
+
+append-driver() {
+ [[ -z $* ]] && return 0
+ if [ -z "${COMMA_DRIVERS}" ] ; then
+ # First in the list
+ COMMA_DRIVERS="$*"
+ FIRST_DRIVER="$*"
+ else
+ # Second, third, ... include a comma at the front
+ COMMA_DRIVERS="${COMMA_DRIVERS},$*"
+ fi
+ return 0
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ # move example clients installed to /usr/bin
+ rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
+ insinto /usr/share/lcdproc/clients
+ doins clients/examples/*.pl
+ doins clients/metar/
+
+ newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
+ newinitd "${FILESDIR}/0.5.1-lcdproc.initd" lcdproc
+
+ dodoc README CREDITS ChangeLog INSTALL TODO
+ dodoc docs/README.* docs/*.txt
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/lcdproc-user
+ doins docs/lcdproc-user/*.html
+ insinto /usr/share/doc/${PF}/lcdproc-dev
+ doins docs/lcdproc-dev/*.html
+ fi
+}
+
+pkg_postinst() {
+ ewarn "IMPORTANT: Please update your /etc/LCDd.conf"
+ ewarn "As of lcdproc-0.5.1-r2, the DriverPath changed from /usr/share/lcdproc to /usr/$(get_libdir)/lcdproc ."
+}
diff --git a/app-misc/lcdproc/lcdproc-0.5.5.ebuild b/app-misc/lcdproc/lcdproc-0.5.5.ebuild
new file mode 100644
index 000000000000..07326bd3f021
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.5.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit multilib versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc debug hid nfs samba seamless-hbars usb lirc irman joystick ftdi"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
+ cwlinux eyeboxone g15 graphlcd glk
+ hd44780 icpa106 imon imonlcd iowarrior
+ lb216 lcdm001 lcterm
+ md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
+ pyramid sed1330 sed1520 serialvfd sli
+ stv5730 SureElec svga t6963 text tyan
+ ula200 xosd ea65 picolcd serialpos
+ i2500vfd irtrans lis shuttlevfd )
+
+# Iterate through the array and add the lcd_devices_* that we support
+NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
+index=0
+while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
+ let "index = ${index} + 1"
+done
+
+REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
+
+RDEPEND="
+ usb? ( virtual/libusb:0 )
+ ftdi? ( dev-embedded/libftdi:0 )
+ lirc? ( app-misc/lirc )
+ irman? ( media-libs/libirman )
+ hid? ( >=dev-libs/libhid-0.2.16 )
+
+ lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver )
+ lcd_devices_g15? ( dev-libs/libg15 dev-libs/libg15render )
+ lcd_devices_ncurses? ( sys-libs/ncurses )
+ lcd_devices_svga? ( media-libs/svgalib )
+ lcd_devices_ula200? ( dev-embedded/libftdi:0 )
+ lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext )
+ lcd_devices_cfontzpacket? ( virtual/libusb:0 )
+ lcd_devices_cwlinux? ( virtual/libusb:0 )
+ lcd_devices_pyramid? ( virtual/libusb:0 )
+ lcd_devices_picolcd? ( virtual/libusb:0 )
+ lcd_devices_i2500vfd? ( dev-embedded/libftdi:0 )
+ lcd_devices_lis? ( dev-embedded/libftdi:0 virtual/libusb:0 )
+ lcd_devices_shuttlevfd? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.5 )"
+RDEPEND="${RDEPEND}
+ lcd_devices_g15? ( app-misc/g15daemon )"
+
+pkg_setup() {
+ if [ -n "${LCDPROC_DRIVERS}" ] ; then
+ ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
+ ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
+ fi
+}
+
+src_prepare() {
+ sed -i "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf || die
+ einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
+}
+
+src_configure() {
+ # This array contains the driver names required by configure --with-drivers=
+ # The positions must be the same as the corresponding use_expand flags
+ local DEVICE_DRIVERS=(curses bayrad CFontz CFontz633 CFontzPacket
+ CwLnx EyeboxOne g15 glcdlib glk
+ hd44780 icp_a106 imon imonlcd IOWarrior
+ lb216 lcdm001 lcterm
+ MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
+ pyramid sed1330 sed1520 serialVFD sli
+ stv5730 SureElec svga t6963 text tyan
+ ula200 xosd ea65 picolcd serialPOS
+ i2500vfd irtrans lis shuttleVFD )
+
+ # Generate comma separated list of drivers
+ COMMA_DRIVERS=""
+ FIRST_DRIVER=""
+ local index=0
+
+ while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
+ append-driver "${DEVICE_DRIVERS[${index}]}"
+ fi
+ let "index = ${index} + 1"
+ done
+
+ # Append the not-lcd-drivers (input)
+ use lirc && append-driver "lirc"
+ use irman && append-driver "irman"
+ use joystick && append-driver "joy"
+
+ if [ -z "${COMMA_DRIVERS}" ] ; then
+ ewarn "You are compiling LCDd without support for any LCD drivers at all."
+ else
+ # Patch the config to contain a driver that is actually installed instead of the default
+ elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
+ elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
+ sed -i "53s:curses:${FIRST_DRIVER}:" LCDd.conf || die
+ fi
+
+ local EXTRA_CONF
+ if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid || \
+ use lcd_devices_picolcd || use lcd_devices_lis || use lcd_devices_shuttlevfd ; then
+ EXTRA_CONF="--enable-libusb"
+ else
+ EXTRA_CONF="$(use_enable usb libusb)"
+ fi
+
+ if use lcd_devices_ula200 || use lcd_devices_i2500vfd || use lcd_devices_lis ; then
+ EXTRA_CONF="${EXTRA_CONF} --enable-libftdi"
+ else
+ EXTRA_CONF="${EXTRA_CONF} $(use_enable ftdi libftdi)"
+ fi
+
+ econf --enable-extra-charmaps \
+ $(use_enable debug) \
+ $(use_enable nfs stat-nfs) \
+ $(use_enable samba stat-smbfs ) \
+ $(use_enable seamless-hbars) \
+ ${EXTRA_CONF} \
+ "--enable-drivers=${COMMA_DRIVERS}"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ ebegin "Creating user documentation"
+ cd "${S}"/docs/lcdproc-user
+ xmlto html --skip-validation lcdproc-user.docbook
+ eend $?
+
+ ebegin "Creating dev documentation"
+ cd "${S}"/docs/lcdproc-dev
+ xmlto html --skip-validation lcdproc-dev.docbook
+ eend $?
+ fi
+}
+
+append-driver() {
+ [[ -z $* ]] && return 0
+ if [ -z "${COMMA_DRIVERS}" ] ; then
+ # First in the list
+ COMMA_DRIVERS="$*"
+ FIRST_DRIVER="$*"
+ else
+ # Second, third, ... include a comma at the front
+ COMMA_DRIVERS="${COMMA_DRIVERS},$*"
+ fi
+ return 0
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # move example clients installed to /usr/bin
+ rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
+ insinto /usr/share/lcdproc/clients
+ doins clients/examples/*.pl
+ doins clients/metar/*.pl
+
+ newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
+ newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
+
+ dodoc README CREDITS ChangeLog INSTALL TODO
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/lcdproc-user
+ doins docs/lcdproc-user/*.html
+ insinto /usr/share/doc/${PF}/lcdproc-dev
+ doins docs/lcdproc-dev/*.html
+ fi
+}
diff --git a/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild
new file mode 100644
index 000000000000..1a748f898607
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit multilib versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="debug doc ftdi hid irman joystick lirc nfs png samba seamless-hbars truetype usb"
+
+# The following array holds the USE_EXPANDed keywords
+IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontzpacket
+ cwlinux eyeboxone g15 graphlcd glk
+ hd44780 icpa106 imon imonlcd iowarrior
+ lb216 lcdm001 lcterm
+ md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
+ pyramid sdeclcd sed1330 sed1520 serialvfd sli
+ stv5730 SureElec svga t6963 text tyan
+ ula200 vlsys_m428 xosd ea65 picolcd serialpos
+ i2500vfd irtrans lis shuttlevfd )
+
+# Iterate through the array and add the lcd_devices_* that we support
+NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
+index=0
+while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
+ let "index = ${index} + 1"
+done
+
+REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
+
+RDEPEND="
+ ftdi? ( dev-embedded/libftdi:0 )
+ hid? ( >=dev-libs/libhid-0.2.16 )
+ irman? ( media-libs/libirman )
+ lirc? ( app-misc/lirc )
+ png? ( media-libs/libpng:0 )
+ truetype? ( media-libs/freetype:2 )
+ usb? ( virtual/libusb:0 )
+
+ lcd_devices_graphlcd? ( app-misc/graphlcd-base app-misc/glcdprocdriver dev-libs/serdisplib )
+ lcd_devices_g15? ( dev-libs/libg15 dev-libs/libg15render )
+ lcd_devices_ncurses? ( sys-libs/ncurses:= )
+ lcd_devices_svga? ( media-libs/svgalib )
+ lcd_devices_ula200? ( dev-embedded/libftdi:0 )
+ lcd_devices_xosd? ( x11-libs/xosd x11-libs/libX11 x11-libs/libXext )
+ lcd_devices_cfontzpacket? ( virtual/libusb:0 )
+ lcd_devices_cwlinux? ( virtual/libusb:0 )
+ lcd_devices_pyramid? ( virtual/libusb:0 )
+ lcd_devices_picolcd? ( virtual/libusb:0 )
+ lcd_devices_i2500vfd? ( dev-embedded/libftdi:0 )
+ lcd_devices_lis? ( dev-embedded/libftdi:0 virtual/libusb:0 )
+ lcd_devices_shuttlevfd? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.5 )"
+RDEPEND="${RDEPEND}
+ lcd_devices_g15? ( app-misc/g15daemon )"
+
+pkg_setup() {
+ if [ -n "${LCDPROC_DRIVERS}" ] ; then
+ ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
+ ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
+ fi
+}
+
+src_prepare() {
+ sed -i "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf || die
+ einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
+}
+
+src_configure() {
+ # This array contains the driver names required by configure --with-drivers=
+ # The positions must be the same as the corresponding use_expand flags
+ local DEVICE_DRIVERS=(curses bayrad CFontz CFontzPacket
+ CwLnx EyeboxOne g15 glcd,glcdlib glk
+ hd44780 icp_a106 imon imonlcd IOWarrior
+ lb216 lcdm001 lcterm
+ MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
+ pyramid sdeclcd sed1330 sed1520 serialVFD sli
+ stv5730 SureElec svga t6963 text tyan
+ ula200 vlsys_m428 xosd ea65 picolcd serialPOS
+ i2500vfd irtrans lis shuttleVFD )
+
+ # Generate comma separated list of drivers
+ COMMA_DRIVERS=""
+ FIRST_DRIVER=""
+ local index=0
+
+ while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+ if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
+ append-driver "${DEVICE_DRIVERS[${index}]}"
+ fi
+ let "index = ${index} + 1"
+ done
+
+ # Append the not-lcd-drivers (input)
+ use lirc && append-driver "lirc"
+ use irman && append-driver "irman"
+ use joystick && append-driver "joy"
+
+ if [ -z "${COMMA_DRIVERS}" ] ; then
+ ewarn "You are compiling LCDd without support for any LCD drivers at all."
+ else
+ # Patch the config to contain a driver that is actually installed instead of the default
+ elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
+ elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
+ sed -i "53s:curses:${FIRST_DRIVER}:" LCDd.conf || die
+ fi
+
+ local EXTRA_CONF
+ if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid || \
+ use lcd_devices_picolcd || use lcd_devices_lis || use lcd_devices_shuttlevfd ; then
+ EXTRA_CONF="--enable-libusb"
+ else
+ EXTRA_CONF="$(use_enable usb libusb)"
+ fi
+
+ if use lcd_devices_ula200 || use lcd_devices_i2500vfd || use lcd_devices_lis ; then
+ EXTRA_CONF="${EXTRA_CONF} --enable-libftdi"
+ else
+ EXTRA_CONF="${EXTRA_CONF} $(use_enable ftdi libftdi)"
+ fi
+
+ econf --enable-extra-charmaps \
+ $(use_enable debug) \
+ $(use_enable nfs stat-nfs) \
+ $(use_enable png libpng) \
+ $(use_enable samba stat-smbfs ) \
+ $(use_enable seamless-hbars) \
+ $(use_enable truetype freetype) \
+ ${EXTRA_CONF} \
+ "--enable-drivers=${COMMA_DRIVERS}"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ ebegin "Creating user documentation"
+ cd "${S}"/docs/lcdproc-user
+ xmlto html --skip-validation lcdproc-user.docbook
+ eend $?
+
+ ebegin "Creating dev documentation"
+ cd "${S}"/docs/lcdproc-dev
+ xmlto html --skip-validation lcdproc-dev.docbook
+ eend $?
+ fi
+}
+
+append-driver() {
+ [[ -z $* ]] && return 0
+ if [ -z "${COMMA_DRIVERS}" ] ; then
+ # First in the list
+ COMMA_DRIVERS="$*"
+ FIRST_DRIVER="$*"
+ else
+ # Second, third, ... include a comma at the front
+ COMMA_DRIVERS="${COMMA_DRIVERS},$*"
+ fi
+ return 0
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # move example clients installed to /usr/bin
+ rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
+ insinto /usr/share/lcdproc/clients
+ doins clients/examples/*.pl
+ doins clients/metar/*.pl
+
+ newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
+ newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
+
+ dodoc README CREDITS ChangeLog INSTALL TODO
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}/lcdproc-user
+ doins docs/lcdproc-user/*.html
+ insinto /usr/share/doc/${PF}/lcdproc-dev
+ doins docs/lcdproc-dev/*.html
+ fi
+}
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
new file mode 100644
index 000000000000..863d531d0995
--- /dev/null
+++ b/app-misc/lcdproc/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <longdescription lang="en">
+ LCDproc is a piece of software that displays real-time system information
+ from your Linux/*BSD box on a LCD. The server supports several serial
+ devices: Matrix Orbital, CrystalFontz, Bayrad, LB216, LCDM001
+ (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some
+ devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and
+ SED1330. Various clients are available that display things like CPU load,
+ system load, memory usage, uptime, and a lot more.
+ </longdescription>
+ <use>
+ <flag name="hid">Enable HID support using libhid</flag>
+ <flag name="irman">Enable support for IRMan (<pkg>media-libs/libirman</pkg>)</flag>
+ <flag name="nfs">Adds support for NFS file system</flag>
+ <flag name="seamless-hbars">Try to avoid gaps in horizontal bars</flag>
+ <flag name="ftdi">Enable support for FTDI connections in some selected LCD_DEVICES (currently hd44780)</flag>
+ <flag name="lcd_devices_sdeclcd">Enable support for VLSYS M428 display</flag>
+ <flag name="lcd_devices_vlsys_m428">Enable support for VLSYS M428 display</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">lcdproc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/leave-20100918-r1 b/app-misc/leave-20100918-r1
deleted file mode 100644
index b3fad3a5b6d0..000000000000
--- a/app-misc/leave-20100918-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=FreeBSD command-line tool that reminds you when its time to leave
-EAPI=6
-HOMEPAGE=http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://gentoo/leave-20100918.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf14d8db8d94ce774995b0658e3f99e9
diff --git a/app-misc/leave/Manifest b/app-misc/leave/Manifest
new file mode 100644
index 000000000000..858a2268cd9e
--- /dev/null
+++ b/app-misc/leave/Manifest
@@ -0,0 +1,5 @@
+AUX README 455 BLAKE2B 5fbc04499c0fd5b636edf37f54e64025c5ad0bbd13d4639559020f11887c45598343e383206e916eb73f59b581f5c78cdc05fa350be59cbc388002b1c639079b SHA512 86135607b70026c849d0851fe4c9aeadc2385eebe2be93949d519f566810916d26388a191c16a88d451d653cb2f6f6ce896948e9f07b9f994c02403898f28242
+AUX leave-fix-makefile.diff 453 BLAKE2B b3252ac7d1bcd41268dc525469b9a35624a0ad34dc4645ce122e59ef08275dba297960f3497a19570b35af7ccefc65454f697be748964da4b44043aad7fb4241 SHA512 a13da158f33c672c28e9e1b5fd169db9c7fcec55f533874ee237c529a4da21b9c68e400ff0f9a3e604c8b487d0548ed6a8693ebaa50b12b660a989f50b60d83a
+DIST leave-20100918.tar.gz 3477 BLAKE2B 2a709c653f2f853d50822fe83bb4f7894aea57ad3d0c15fb4ca4b5c3abccf63f0cd3344f379691e7721915e2bb5f6f1c61506f265e9cd6d74175ae4657e72376 SHA512 69df594800159bc80baeb3945aad144ceabe21bdac22ed2cd706b0ec610895dc82e58bae59ed0230eb97e909812bc90237b7c70e965125e7fa6767972a6259d1
+EBUILD leave-20100918-r1.ebuild 632 BLAKE2B 547942512b07bd3f3f5863fde9d7f71d128719525e02d513caab4ac1d4877102e05e5e3193f8b469d16cd832d50f6418fe5192f7c0808200827057336a7ec384 SHA512 cb4b211e94ec8d8f5c7b23f1f7910da8fb13a20afaddc649b44d8a8cc526b346e10efee3ddef90a8b96e6ecbb10e280c2ff28b0da6e466e9c05beacc82ef13c3
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/leave/files/README b/app-misc/leave/files/README
new file mode 100644
index 000000000000..1af71d7431fd
--- /dev/null
+++ b/app-misc/leave/files/README
@@ -0,0 +1,9 @@
+The leave utility waits until the specified time, then reminds you that you
+have to leave. You are reminded 5 minutes and 1 minute before the actual
+time, at the time, and every minute thereafter. When you log off, leave
+exits just before it would have printed the next message.
+
+To get rid of leave you should either log off or use `kill -s KILL` giving its
+process id.
+
+This program is included with FreeBSD and is distributed under the BSD license.
diff --git a/app-misc/leave/files/leave-fix-makefile.diff b/app-misc/leave/files/leave-fix-makefile.diff
new file mode 100644
index 000000000000..772add57d6fb
--- /dev/null
+++ b/app-misc/leave/files/leave-fix-makefile.diff
@@ -0,0 +1,20 @@
+--- a/Makefile.orig 2004-10-16 23:04:50.144563171 -0400
++++ b/Makefile 2004-10-16 23:57:27.639495962 -0400
+@@ -2,5 +2,16 @@
+ # $FreeBSD: /repoman/r/ncvs/src/usr.bin/leave/Makefile,v 1.5 2002/02/08 22:31:41 markm Exp $
+
+ PROG= leave
++CC ?= gcc
++CFLAGS=
++LDFLAGS=
+
+-.include <bsd.prog.mk>
++#.include <bsd.prog.mk>
++
++all: $(PROG)
++$(PROG): leave.o
++ $(CC) $(LDFLAGS) leave.o -o $(PROG)
++leave.o:
++ $(CC) $(CFLAGS) -c leave.c
++clean:
++ rm -f $(PROG) *.o
diff --git a/app-misc/leave/leave-20100918-r1.ebuild b/app-misc/leave/leave-20100918-r1.ebuild
new file mode 100644
index 000000000000..f9514aa08ae4
--- /dev/null
+++ b/app-misc/leave/leave-20100918-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="FreeBSD command-line tool that reminds you when its time to leave"
+HOMEPAGE="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-fix-makefile.diff"
+)
+
+src_compile() {
+ cp -v "${FILESDIR}/README" . || die
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/leave/metadata.xml b/app-misc/leave/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/leave/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/ledit-2.03 b/app-misc/ledit-2.03
deleted file mode 100644
index dff0652444cf..000000000000
--- a/app-misc/ledit-2.03
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.09:=[ocamlopt?] dev-ml/camlp5:=
-DESCRIPTION=A line editor to be used with interactive commands
-EAPI=5
-HOMEPAGE=http://pauillac.inria.fr/~ddr/ledit/
-IUSE=+ocamlopt
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.09:=[ocamlopt?] dev-ml/camlp5:=
-RESTRICT=installsources
-SLOT=0
-SRC_URI=http://pauillac.inria.fr/~ddr/ledit/distrib/src/ledit-2.03.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d3596313b73c8162d42dd3cea8211ba
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
new file mode 100644
index 000000000000..7fbee6313fc6
--- /dev/null
+++ b/app-misc/ledit/Manifest
@@ -0,0 +1,3 @@
+DIST ledit-2.03.tgz 24319 BLAKE2B d0a9dfbcb21b54075b61db34035291eaf3df4a337ea9fcf24b8b163d8a45c00b667dd311f39765dc904cbae1ec34e8773dea4c7ec6753796e768a8ee4cbbb927 SHA512 94281ea31d02c046db73bed42a1835826f063ff5d1ff4c374356e37fdf6b1a018f95a6372ece0eec53193aaf2e95c234c509ac178541bfe48dbc6f223f34f661
+EBUILD ledit-2.03.ebuild 872 BLAKE2B 6ecd27a40859d364f3e5e94747d4d040d06daa800d314a106d3ba4a8b63529845861b8358b44f731accbfa9f10003e1bea8dfd3f5c6dddd7810f89587083184a SHA512 6bcc0b182738fc40b2f54f18d7c1ec039aea53e34a59dff5e3d69e665b68c27e7593823b45a87c620348d0abd5ab5574983023a596f0f7c8b5a813282ba05c5b
+MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/app-misc/ledit/ledit-2.03.ebuild b/app-misc/ledit/ledit-2.03.ebuild
new file mode 100644
index 000000000000..caec36f62406
--- /dev/null
+++ b/app-misc/ledit/ledit-2.03.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+RESTRICT="installsources"
+IUSE="+ocamlopt"
+
+DESCRIPTION="A line editor to be used with interactive commands"
+SRC_URI="http://pauillac.inria.fr/~ddr/ledit/distrib/src/${P}.tgz"
+HOMEPAGE="http://pauillac.inria.fr/~ddr/ledit/"
+
+DEPEND=">=dev-lang/ocaml-3.09:=[ocamlopt?]
+ dev-ml/camlp5:="
+RDEPEND="${DEPEND}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 ledit.opt
+ else
+ # If using bytecode we dont want to strip the binary as it would remove the
+ # bytecode and only leave ocamlrun...
+ export STRIP_MASK="*/bin/*"
+ fi
+}
+
+src_install() {
+ if use ocamlopt; then
+ newbin ledit.opt ledit
+ else
+ newbin ledit.out ledit
+ fi
+ doman ledit.1
+ dodoc CHANGES README
+}
diff --git a/app-misc/ledit/metadata.xml b/app-misc/ledit/metadata.xml
new file mode 100644
index 000000000000..ffa6c6b4395b
--- /dev/null
+++ b/app-misc/ledit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/lfm-2.3-r1 b/app-misc/lfm-2.3-r1
deleted file mode 100644
index cc020669988a..000000000000
--- a/app-misc/lfm-2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Last File Manager is a powerful file manager for the console
-EAPI=5
-HOMEPAGE=https://inigo.katxi.org/devel/lfm/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-2.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6adeb9c9cd5c235a7acbc0da8bd1d0ac
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
new file mode 100644
index 000000000000..86dff33b1272
--- /dev/null
+++ b/app-misc/lfm/Manifest
@@ -0,0 +1,4 @@
+AUX lfm-2.3-no-doc.patch 418 BLAKE2B afefe598a4ad9d1540234cd92c7574fef10e59bfeb13a9e9e2156bfc9296d9c7bd72fa2f7221c25533bb286014f8f73e5ccf1f1de023db49ec773952164aabce SHA512 d914da807c56a8ba38a9c9c2d6ac8c1ab5a9ec935cc55fd0a8ca5d12ecda571fd64a41938942586c9cc0e80a53a8d83cecc347decc66ebec719f78ce9a0b0d3b
+DIST lfm-2.3.tar.gz 119120 BLAKE2B 12d72d1caed7745dc336644589fba359c198c145d29bb419dbd0586ebe5e170d1a743e24638913a4581137c6e0d2f312a58fb84b22218ecb3f93942cf3d63db9 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7
+EBUILD lfm-2.3-r1.ebuild 487 BLAKE2B b90afce9b3e1fcccf340b916a6f559a2ab9045072b90f413ee168da331aadf158d178f745a74426db6d463629dfcd74225ce48aa4c32574b9f24149dca28e024 SHA512 0a336f8697a43fe176bc3001182be2eae2ca6e5058095247e6e5af3eccd89b89ce6d2af4bd486d4ba5912dc8d72d345b408f8d681b7a563929afe50aca0c0d26
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/lfm/files/lfm-2.3-no-doc.patch b/app-misc/lfm/files/lfm-2.3-no-doc.patch
new file mode 100644
index 000000000000..3b69881589e0
--- /dev/null
+++ b/app-misc/lfm/files/lfm-2.3-no-doc.patch
@@ -0,0 +1,12 @@
+--- lfm-2.3/setup.py.orig
++++ lfm-2.3/setup.py
+@@ -56,8 +56,7 @@
+ 'lfm/actions', 'lfm/compress', 'lfm/utils', 'lfm/vfs',
+ 'lfm/config', 'lfm/pyview'],
+ scripts = ['lfm/lfm', 'lfm/pyview'],
+- data_files = [('share/doc/lfm', DOC_FILES),
+- ('share/man/man1', MAN_FILES)]
++ data_files = [('share/man/man1', MAN_FILES)]
+ # **addargs
+ )
+
diff --git a/app-misc/lfm/lfm-2.3-r1.ebuild b/app-misc/lfm/lfm-2.3-r1.ebuild
new file mode 100644
index 000000000000..63105cd4a3a5
--- /dev/null
+++ b/app-misc/lfm/lfm-2.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Last File Manager is a powerful file manager for the console"
+HOMEPAGE="https://inigo.katxi.org/devel/lfm/"
+SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-doc.patch
+}
diff --git a/app-misc/lfm/metadata.xml b/app-misc/lfm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/lfm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/linux-logo-5.11-r3 b/app-misc/linux-logo-5.11-r3
deleted file mode 100644
index 607677642283..000000000000
--- a/app-misc/linux-logo-5.11-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm
-DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A utility that displays an ANSI/ASCII logo and some system information
-EAPI=5
-HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
-IUSE=nls
-KEYWORDS=amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-5.11.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0b5e41ebc4a28d75362848765e48de2d
diff --git a/app-misc/linux-logo-5.11-r4 b/app-misc/linux-logo-5.11-r4
deleted file mode 100644
index ee47f72a6961..000000000000
--- a/app-misc/linux-logo-5.11-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm
-DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A utility that displays an ANSI/ASCII logo and some system information
-EAPI=6
-HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
-IUSE=nls
-KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-5.11.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=18de6f824f48a205391b9f6d8b73ea07
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
new file mode 100644
index 000000000000..ac4066d7ee9f
--- /dev/null
+++ b/app-misc/linux-logo/Manifest
@@ -0,0 +1,12 @@
+AUX gentoo-alt.logo 1672 BLAKE2B 19cd7ac8cf29cb253cf2a2b44be7f369ac840f6f891e19bd550a2b6ae0c4098d10c28bad4003c83f7cae5a462f66d676393cd855e96dcd51d6234c86d72b8fda SHA512 7068100889469c489ec327fa1aaa9503c6b54b350b2d7786ad1cbd9bcafb92630220820defd01089d3dc52c7dab2c2f2787aef4361430f8dc97894b46f3d72de
+AUX gentoo-linux.logo 4788 BLAKE2B 3b130f25770a7d39c2a86bcb7c09aefb254721de7ebae629eb55faa2ccf435ee6bff147b7b230493e31c6f678e30746b21275e9eb7a93369076caa309dfdca45 SHA512 63f72473c05073258c47b0b24bc8dea4e7f3e4e060d8296ae31eee2dccb93c159ed473ef23924e96fa47a4796150e16c542908d55312a660ccf0696904962fbe
+AUX linux-logo-5.11-add-aarch64-support.patch 422 BLAKE2B 29b9163b930192d5fc83e549d5bf2e149e1a5d85aa6485fa3b60ca964d5e376c3d0f26cc63c3a28f6e1d85a3ecdb63594a48d3bc0726c7bb7aea4c8e676d0d6f SHA512 0af44f11d7aa4c96be50e77d65a966b56002a7b8903d5f109695e2151f7bde64a52645ba291b429dcfb7c5cb2cc2d29147e88ac0db4d1a2589e63427417d0133
+AUX linux-logo-5.11.conf 1225 BLAKE2B c84f6722843d01052a40b5270e816d35fad11423c5072107c5794aab14dceff6494659cc6a5ea381a905f571f87da599f6dd50a1325370de57534b67b5b0ec88 SHA512 b277fb20fb4db7420fad63f7412513f992471e64985d9e8f7ed4d3975fc9c5dac4ed777bc3b0cf6138bbab5a38c519ae75039bd89e42503b75e7d5ce191846d1
+AUX linux-logo.init.d 938 BLAKE2B 9760e591b1500a4776eaf1f24eb0903dc6d1a21102c2cf45373ab3a7f104ae87bfd31476c5bed7be32119a36764986f0de98f9a3eeb0d4bd6a750109adbd0b2e SHA512 0c021418a4e7e31df3aada8bd3c7cebd97f8e812d086a45aaff5d5779650195e92e87072a3627a3bb50384f10fccafd78cd966c8daed6775bbe58f6305e6db53
+AUX linux-logo.service 155 BLAKE2B 706487d4b0a266d563bf427996ba15775a6e317d77a71d1e7c359499617a2065e74f500884736e8becc3fa64907feff8a06b2644c1337e295d3f24383b47c7ff SHA512 01b5917d1a7a70faa2622e459f4e27b5e23f15481ac94cae51ee39799d15f783a6427c7430067208a7a73e6f270527c1e64740c6eb31ce0f17a4777343bc3261
+AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895c76c379f90470d4ac9d28d24c8f02321ceab42007cb149c5d20bd7b87bbd2f978f289123fda2afba941 SHA512 a1098c1ea4c867c8950e744c598373f6f409eb411525b2e6e7a0e592b78ba237ec71a591b13c8a958e4622c3471d087ef196d07e2a958450392b75aeb9318513
+AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
+DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
+EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
+EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
+MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
diff --git a/app-misc/linux-logo/files/gentoo-alt.logo b/app-misc/linux-logo/files/gentoo-alt.logo
new file mode 100644
index 000000000000..f60430dade98
--- /dev/null
+++ b/app-misc/linux-logo/files/gentoo-alt.logo
@@ -0,0 +1,39 @@
+# Gentoo Logo
+# Added by James Rowe <Jay@jnrowe.uklinux.net>
+# Assigned to Gentoo Foundation under GPL2
+
+SYSINFO_POSITION bottom
+
+NAME gentoo-alt
+
+DESCRIPTION_STRING Gentoo Linux Logo
+
+BEGIN_LOGO
+
+
+ .
+ .vir. d$b
+ .d$$$$$$b. .cd$$b. .d$$b. d$$$$$$$$$$$b .d$$b. .d$$b.
+ $$$$( )$$$b d$$$()$$$. d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b. .$$$$$$$b.
+ Q$$$$$$$$$$B$$$$$$$$P" d$$$PQ$$$$b. $$$$. .$$$P' `$$$ .$$$P' `$$$
+ "$$$$$$$P Q$$$$$$$b d$$$P Q$$$$b $$$$b $$$$b..d$$$ $$$$b..d$$$
+ d$$$$$$P" "$$$$$$$$ Q$$$ Q$$$$ $$$$$ `Q$$$$$$$P `Q$$$$$$$P
+| $$$$$$$P `""""" "" "" Q$$$P "Q$$$P" "Q$$$P"
+| `Q$$P" """
++--------------------------------------------------------- l i n u x
+END_LOGO
+
+BEGIN_ASCII_LOGO
+
+
+ .
+ .vir. d$b
+ .d$$$$$$b. .cd$$b. .d$$b. d$$$$$$$$$$$b .d$$b. .d$$b.
+ $$$$( )$$$b d$$$()$$$. d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b. .$$$$$$$b.
+ Q$$$$$$$$$$B$$$$$$$$P" d$$$PQ$$$$b. $$$$. .$$$P' `$$$ .$$$P' `$$$
+ "$$$$$$$P Q$$$$$$$b d$$$P Q$$$$b $$$$b $$$$b..d$$$ $$$$b..d$$$
+ d$$$$$$P" "$$$$$$$$ Q$$$ Q$$$$ $$$$$ `Q$$$$$$$P `Q$$$$$$$P
+| $$$$$$$P `""""" "" "" Q$$$P "Q$$$P" "Q$$$P"
+| `Q$$P" """
++--------------------------------------------------------- l i n u x
+END_ASCII_LOGO
diff --git a/app-misc/linux-logo/files/gentoo-linux.logo b/app-misc/linux-logo/files/gentoo-linux.logo
new file mode 100644
index 000000000000..73581f001eb5
--- /dev/null
+++ b/app-misc/linux-logo/files/gentoo-linux.logo
@@ -0,0 +1,82 @@
+# Gentoo Linux logo
+# Drawn by Harri Hautakangas
+# Assigned to Gentoo Foundation under GPL2
+
+SYSINFO_POSITION bottom
+
+NAME gentoo
+
+DESCRIPTION_STRING Gentoo Logo
+
+BEGIN_LOGO
+.....####......................................##
+#.............................
+....#######....................... ###
+.........###.............................
+...##########.....................
+####....#############...................
+.....
+...####..#######....#####
+........######...#############...
+#####.......#####....
+...#############...######
+#......########...
+############..#######
+.....#######...
+....###########.. ##
+#.####..... ###
+#.####......###
+#.... #########...#########
+..
+......########...########
+......#####..###
+#.....####....###########
+.###########.
+.......######....######........
+####....####....
+####....########
+###.###########.
+......######.....######.......
+#####.....####..
+.####....#####.
+.####.#####..####
+.
+.....######......##########...
+####.......####.
+.####....##########
+..##########..
+.....#####.......########
+###.#####........#
+###.####.....#
+#######....########...
+.....####.........#
+#########.#####
+........####.###
+#......######......#
+#####....
+......##...........######## 
+. ####.........##...
+###.......####........
+####.....
+................................................................
+... ...........
+
+END_LOGO
+
+BEGIN_ASCII_LOGO
+.....####......................................###.............................
+....#######....................... ###.........###.............................
+...##########.....................####....#############........................
+...####..#######....#####........######...#############...#####.......#####....
+...#############...#######......########...############..#######.....#######...
+....###########.. ###.####..... ####.####......####.... #########...#########..
+......########...########......#####..####.....####....###########.###########.
+.......######....######........####....####....####....###########.###########.
+......######.....######.......#####.....####...####....#####..####.#####..####.
+.....######......##########...####.......####..####....##########..##########..
+.....#####.......###########.#####........####.####.....########....########...
+.....####.........##########.#####........####.####......######......######....
+......##...........######## . ####.........##...###.......####........####.....
+................................................................... ...........
+
+END_ASCII_LOGO
diff --git a/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch
new file mode 100644
index 000000000000..8ea15ebab6ac
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch
@@ -0,0 +1,13 @@
+diff -Nuar a/libsysinfo-0.2.2/Linux/Makefile b/libsysinfo-0.2.2/Linux/Makefile
+--- a/libsysinfo-0.2.2/Linux/Makefile 2010-02-15 18:15:07.000000000 +0100
++++ b/libsysinfo-0.2.2/Linux/Makefile 2018-01-03 20:16:48.299998620 +0100
+@@ -6,6 +6,9 @@
+ ifneq (,$(findstring arm,$(ARCH)))
+ ARCH := arm
+ endif
++ifneq (,$(findstring aarch64,$(ARCH)))
++ ARCH := arm
++endif
+ ifneq (,$(findstring sh,$(ARCH)))
+ ARCH := sh
+ endif
diff --git a/app-misc/linux-logo/files/linux-logo-5.11.conf b/app-misc/linux-logo/files/linux-logo-5.11.conf
new file mode 100644
index 000000000000..355ebc5cc089
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11.conf
@@ -0,0 +1,28 @@
+# Seq Description Output
+# ----------------------------------------------------------------
+# ## #
+# #B Bogomips 374.37
+# #C Compiled Date #47 Fri Jan 8 10:37:09 EST 1999
+# #E User Text My Favorite Linux Distribution
+# Displayed with -t
+# #H Hostname deranged
+# #L Load average Load average 0.04, 0.01, 0.01
+# #M Megahertz 188Mhz
+# where supported
+# #N Number of CPU's Two
+# #O OS Name Linux
+# #P Processor or Processors Processor
+# #R Ram 64M
+# in Megabytes
+# #S Plural s
+# #T Type of CPU K6
+# #U Uptime Uptime 10 hours 59 minutes
+# #V Version of OS 2.2.0-pre5
+# #X CPU Vendor AMD
+# \\n carriage return
+
+LOGO="-L gentoo"
+FORMAT="Gentoo #O `cat /etc/gentoo-release | awk '{ print $5,$6 }'`\n#O #V, Compiled #C\n#N #X #T #M CPU#S, #R RAM, #B Bogomips\n#U\n#H / \l \n"
+FORMATNET="Gentoo #O `cat /etc/gentoo-release | awk '{ print $5,$6 }'`\n#O #V, Compiled #C\n#N #X #T #M CPU#S, #R RAM, #B Bogomips\n#U\n#H\n"
+OPTIONS="-f -u"
+
diff --git a/app-misc/linux-logo/files/linux-logo.init.d b/app-misc/linux-logo/files/linux-logo.init.d
new file mode 100644
index 000000000000..68a6700aec1e
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo.init.d
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+
+ISSUE_BACKUP_FILE="/etc/issue.linux-logo.backup"
+ISSUE_NET_BACKUP_FILE="/etc/issue.net.linux-logo.backup"
+
+start() {
+ ebegin "Starting linux_logo"
+
+ if [ ! -x /usr/bin/linux_logo ]
+ then
+ eerror "ERROR: linux_logo not found !"
+ return 1
+ fi
+
+ ebegin " Creating /etc/issue"
+ cp /etc/issue ${ISSUE_BACKUP_FILE} 2> /dev/null
+ /usr/bin/linux_logo ${LOGO} ${OPTIONS} -F "${FORMAT}" > /etc/issue
+ eend $? " Failed to create /etc/issue"
+
+ if [ -f /etc/issue.net ]
+ then
+ ebegin " Creating /etc/issue.net"
+ cp /etc/issue.net ${ISSUE_NET_BACKUP_FILE} 2> /dev/null
+ /usr/bin/linux_logo ${LOGO} ${OPTIONS} -F "${FORMATNET}" > \
+ /etc/issue.net
+ eend $? " Failed to create /etc/issue.net"
+ fi
+}
+
+stop() {
+ ebegin "Stopping linux_logo"
+ [ -f ${ISSUE_NET_BACKUP_FILE} ] && \
+ mv ${ISSUE_NET_BACKUP_FILE} /etc/issue.net 2> /dev/null
+ [ -f ${ISSUE_BACKUP_FILE} ] && \
+ mv ${ISSUE_BACKUP_FILE} /etc/issue 2> /dev/null
+}
diff --git a/app-misc/linux-logo/files/linux-logo.service b/app-misc/linux-logo/files/linux-logo.service
new file mode 100644
index 000000000000..658d7103c5e9
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=linux-logo-creator
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/linux_logo_creator
+
+[Install]
+WantedBy=logo.target
diff --git a/app-misc/linux-logo/files/linux_logo_creator b/app-misc/linux-logo/files/linux_logo_creator
new file mode 100644
index 000000000000..5acc2fd5b85b
--- /dev/null
+++ b/app-misc/linux-logo/files/linux_logo_creator
@@ -0,0 +1,12 @@
+#!/bin/bash
+FORMAT="Gentoo #O `cat /etc/gentoo-release | awk '{ print $5,$6 }'`\n#O #V, Compiled #C\n#N #X #T #M CPU#S, #R RAM, #B Bogomips\n#U\n#H / \l \n"
+FORMATNET="Gentoo #O `cat /etc/gentoo-release | awk '{ print $5,$6 }'`\n#O #V, Compiled #C\n#N #X #T #M CPU#S, #R RAM, #B Bogomips\n#U\n#H\n"
+OPTIONS="-L 2 -f -u"
+OPTIONSNET="-L 2 -f -u -a "
+
+# FORMAT="Gentoo Linux `cat /etc/gentoo-release | awk '{ print $5,$6 }'`"
+# /usr/bin/linux_logo -L 2 -f -u
+
+/usr/bin/linux_logo ${LOGO} ${OPTIONS} -F "${FORMAT}" > /etc/issue
+/usr/bin/linux_logo ${LOGO} ${OPTIONSNET} -F "${FORMATNET}" > /etc/issue.net
+
diff --git a/app-misc/linux-logo/files/logo-config b/app-misc/linux-logo/files/logo-config
new file mode 100644
index 000000000000..68ce395cf5ec
--- /dev/null
+++ b/app-misc/linux-logo/files/logo-config
@@ -0,0 +1,7 @@
+./logos/gentoo-linux.logo
+./logos/gentoo-alt.logo
+./logos/banner-simplified.logo
+./logos/banner.logo
+./logos/classic-no_periods.logo
+./logos/classic-no_periods_or_chars.logo
+./logos/classic.logo
diff --git a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
new file mode 100644
index 000000000000..6406607e1caa
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs systemd
+
+MY_P=${PN/-/_}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ cp "${FILESDIR}"/logo-config "${S}/logo_config" || die
+ cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
+ cp "${FILESDIR}"/linux-logo.service "${S}/" || die
+ cp "${FILESDIR}"/gentoo-*.logo "${S}"/logos/ || die
+
+ # Remove warn_unused_result warning
+ sed -i -e 's/FILE \*fff;/FILE \*fff;\n char *stemp;/' \
+ -e 's/fgets/stemp=fgets/' "${S}"/load_logo.c || die
+}
+
+src_configure() {
+ ARCH="" ./configure --prefix="${ED}"/usr || die
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake install
+
+ dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
+
+ dobin "${FILESDIR}"/linux_logo_creator
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ newconfd "${FILESDIR}"/${P}.conf ${PN}
+
+ # systemd support
+ systemd_newunit "${FILESDIR}/linux-logo.service" "linux-logo.service"
+}
+
+pkg_postinst() {
+ echo
+ elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
+ elog ""
+ elog "To display the first Gentoo logo type: linux_logo -L gentoo"
+ elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
+ elog "To display all the logos available type: linux_logo -L list."
+ elog ""
+ elog "To start linux_logo on boot, please type:"
+ elog " rc-update add linux-logo default"
+ elog "or for systemd"
+ elog " systemctl enable linux-logo.service"
+ elog "which uses the settings found in"
+ elog " /etc/conf.d/linux-logo"
+ echo
+}
+
+pkg_prerm() {
+ # Restore issue files
+ mv /etc/issue.linux-logo.backup /etc/issue 2> /dev/null
+ mv /etc/issue.net.linux-logo.backup /etc/issue.net 2> /dev/null
+}
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
new file mode 100644
index 000000000000..e78323f95a05
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs systemd
+
+MY_P=${PN/-/_}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ cp "${FILESDIR}"/logo-config "${S}/logo_config" || die
+ cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
+ cp "${FILESDIR}"/linux-logo.service "${S}/" || die
+ cp "${FILESDIR}"/gentoo-*.logo "${S}"/logos/ || die
+
+ eapply "${FILESDIR}"/"${P}"-add-aarch64-support.patch
+ # Remove warn_unused_result warning
+ sed -i -e 's/FILE \*fff;/FILE \*fff;\n char *stemp;/' \
+ -e 's/fgets/stemp=fgets/' "${S}"/load_logo.c || die
+ eapply_user
+}
+
+src_configure() {
+ ARCH="" ./configure --prefix="${ED}"/usr || die
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake install
+
+ dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
+
+ dobin "${FILESDIR}"/linux_logo_creator
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ newconfd "${FILESDIR}"/${P}.conf ${PN}
+
+ # systemd support
+ systemd_newunit "${FILESDIR}/linux-logo.service" "linux-logo.service"
+}
+
+pkg_postinst() {
+ echo
+ elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
+ elog ""
+ elog "To display the first Gentoo logo type: linux_logo -L gentoo"
+ elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
+ elog "To display all the logos available type: linux_logo -L list."
+ elog ""
+ elog "To start linux_logo on boot, please type:"
+ elog " rc-update add linux-logo default"
+ elog "or for systemd"
+ elog " systemctl enable linux-logo.service"
+ elog "which uses the settings found in"
+ elog " /etc/conf.d/linux-logo"
+ echo
+}
+
+pkg_prerm() {
+ # Restore issue files
+ mv /etc/issue.linux-logo.backup /etc/issue 2> /dev/null
+ mv /etc/issue.net.linux-logo.backup /etc/issue.net 2> /dev/null
+}
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
new file mode 100644
index 000000000000..8848712a8765
--- /dev/null
+++ b/app-misc/linux-logo/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>nimiux@gentoo.org</email>
+ <name>Chema Alonso</name>
+</maintainer>
+<longdescription lang="en">
+ A utility that displays an ANSI/ASCII logo and some system information
+</longdescription>
+<longdescription lang="es">
+ Una utilidad que muestra un logotipo ANSI/ASCII e información del sistema
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/linuxspa-0.7.1-r2 b/app-misc/linuxspa-0.7.1-r2
deleted file mode 100644
index 3cb737d54168..000000000000
--- a/app-misc/linuxspa-0.7.1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Linux Serial Protocol Analyser
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/serialsniffer/
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/serialsniffer/LinuxSPA-0.7.1.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f8aa5521508fa36f9b6f3357fe9fcab
diff --git a/app-misc/linuxspa/Manifest b/app-misc/linuxspa/Manifest
new file mode 100644
index 000000000000..bf0f5ad8f728
--- /dev/null
+++ b/app-misc/linuxspa/Manifest
@@ -0,0 +1,4 @@
+AUX linuxspa-0.7.1-compile-fix.patch 345 BLAKE2B 98594daf87751bab29059329768e7de15b5310afe6480438791751c209be10478a95ad0d9b8b6bd5fe748e990ab52753daf30bba622fce434e9017dc6b54bde2 SHA512 28ca542d3b72cbf7a5e33caa1a98b6a0d76a021359f5fa7222cc1328b938dffc5fdf4a39cf11d60c7247d269cce938239a1c0eff8e32b60835598a41290c07a5
+DIST LinuxSPA-0.7.1.tgz 45448 BLAKE2B a3181e823cf780e000bed2850786bda8045e5d4781ccd78fad420fd42109918aa5c8167ca4a1246795c8c98bea65b3fbe633d6fcea3d58770199c33eab81b5e8 SHA512 4b622330e88abe7d4b91392e75ef8d90902b731e051a7bdc93895aa82b6ae33a5e65bbe950c8d6884985cf8b7bdb1c3dd46b24d75f7c90a872e0a7758f929673
+EBUILD linuxspa-0.7.1-r2.ebuild 850 BLAKE2B 16f6b4dfe385f1bea3c4e2d565acea5bfb672f0c19fadab134d96b2f252dd09a4329acfc78d3f27dccc9281de211b8f2ce76c06cc84339cb92521e863f58ff06 SHA512 5f818484257272ea59c0df8ced170a37682b69c9e5b391081fe2264879e376866792d596c52c8f72a7ec890c74941b0a39ad08d27276d73e7b48581c9675f62f
+MISC metadata.xml 317 BLAKE2B da3d82b00fe50b1bdab6212a93c7acd25587825cb1999f85f3a27ff1902cffeeb0de13202bc32f4549e6369a2cedcf422625e584a658a19b08eae633ebe1bc21 SHA512 a6d35dec316005a67ca7ab5da64ff695567b864282601de68b8cf2927ca28c5c0970592ef27c8d5031a0fb3dfbef7753e485fc4a6cacfc3beecef475fba14d72
diff --git a/app-misc/linuxspa/files/linuxspa-0.7.1-compile-fix.patch b/app-misc/linuxspa/files/linuxspa-0.7.1-compile-fix.patch
new file mode 100644
index 000000000000..d8a3c858647b
--- /dev/null
+++ b/app-misc/linuxspa/files/linuxspa-0.7.1-compile-fix.patch
@@ -0,0 +1,12 @@
+diff -ur a/std232.c b/std232.c
+--- a/std232.c 2003-07-18 22:08:33.000000000 -0300
++++ b/std232.c 2006-05-11 21:31:33.000000000 -0300
+@@ -89,7 +89,7 @@
+ {
+ unsigned int index;
+
+- (unsigned int) index = strtol(temp, NULL, 16);
++ index = strtol(temp, NULL, 16);
+ if (index < 256)
+ return (&cmatrix[index][0]);
+ else return (&dmatrix[0]);
diff --git a/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild b/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..bb0ccd7bc9df
--- /dev/null
+++ b/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_PN="LinuxSPA"
+DESCRIPTION="Linux Serial Protocol Analyser"
+HOMEPAGE="https://sourceforge.net/projects/serialsniffer/"
+SRC_URI="mirror://sourceforge/serialsniffer/${MY_PN}-${PV}.tgz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=( "${FILESDIR}/${P}-compile-fix.patch" )
+
+src_prepare() {
+ default
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -Wall" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin LinuxSPA std232
+ dodoc ASCII_Filter.txt BCircuit.txt LinuxSPA.png READING_Materials.txt \
+ README TODO connector-1a.ps connector-2a.ps cooked.file raw.file
+}
diff --git a/app-misc/linuxspa/metadata.xml b/app-misc/linuxspa/metadata.xml
new file mode 100644
index 000000000000..77681b22f7c4
--- /dev/null
+++ b/app-misc/linuxspa/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription>Linux Serial Protocol Analyser</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">serialsniffer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/lirc-0.10.0 b/app-misc/lirc-0.10.0
deleted file mode 100644
index 66a1dd9ef8fd..000000000000
--- a/app-misc/lirc-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
-DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
-EAPI=6
-HOMEPAGE=http://www.lirc.org/
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) inputlirc? ( app-misc/inputlircd )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) gtk? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/lirc/lirc-0.10.0.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71d6d49970421d6e3b066d8ea9e000ef
diff --git a/app-misc/lirc-0.10.1 b/app-misc/lirc-0.10.1
deleted file mode 100644
index d5c878ea497b..000000000000
--- a/app-misc/lirc-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
-DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
-EAPI=6
-HOMEPAGE=http://www.lirc.org/
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) inputlirc? ( app-misc/inputlircd )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) gtk? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71d6d49970421d6e3b066d8ea9e000ef
diff --git a/app-misc/lirc-0.9.0-r6 b/app-misc/lirc-0.9.0-r6
deleted file mode 100644
index 0093274bfae4..000000000000
--- a/app-misc/lirc-0.9.0-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi:0 ) lirc_devices_all? ( dev-embedded/libftdi:0 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
-EAPI=4
-HOMEPAGE=http://www.lirc.org/
-IUSE=debug doc hardware-carrier transmitter static-libs X lirc_devices_all lirc_devices_userspace lirc_devices_accent lirc_devices_act200l lirc_devices_act220l lirc_devices_adaptec lirc_devices_alsa_usb lirc_devices_animax lirc_devices_asusdh lirc_devices_atilibusb lirc_devices_atiusb lirc_devices_audio lirc_devices_audio_alsa lirc_devices_avermedia lirc_devices_avermedia_vdomate lirc_devices_avermedia98 lirc_devices_awlibusb lirc_devices_bestbuy lirc_devices_bestbuy2 lirc_devices_breakoutbox lirc_devices_bte lirc_devices_bw6130 lirc_devices_caraca lirc_devices_chronos lirc_devices_commandir lirc_devices_cph06x lirc_devices_creative lirc_devices_creative_infracd lirc_devices_devinput lirc_devices_digimatrix lirc_devices_dsp lirc_devices_dvico lirc_devices_ea65 lirc_devices_ene0100 lirc_devices_exaudio lirc_devices_flyvideo lirc_devices_ftdi lirc_devices_gvbctv5pci lirc_devices_hauppauge lirc_devices_hauppauge_dvb lirc_devices_hercules_smarttv_stereo lirc_devices_i2cuser lirc_devices_igorplugusb lirc_devices_iguanaIR lirc_devices_imon lirc_devices_imon_24g lirc_devices_imon_knob lirc_devices_imon_lcd lirc_devices_imon_pad lirc_devices_imon_rsc lirc_devices_irdeo lirc_devices_irdeo_remote lirc_devices_irlink lirc_devices_irman lirc_devices_irreal lirc_devices_it87 lirc_devices_ite8709 lirc_devices_knc_one lirc_devices_kworld lirc_devices_leadtek_0007 lirc_devices_leadtek_0010 lirc_devices_leadtek_pvr2000 lirc_devices_livedrive_midi lirc_devices_livedrive_seq lirc_devices_logitech lirc_devices_macmini lirc_devices_mediafocusI lirc_devices_mouseremote lirc_devices_mouseremote_ps2 lirc_devices_mp3anywhere lirc_devices_mplay lirc_devices_nslu2 lirc_devices_packard_bell lirc_devices_parallel lirc_devices_pcmak lirc_devices_pcmak_usb lirc_devices_pctv lirc_devices_pixelview_bt878 lirc_devices_pixelview_pak lirc_devices_pixelview_pro lirc_devices_provideo lirc_devices_realmagic lirc_devices_remotemaster lirc_devices_sa1100 lirc_devices_samsung lirc_devices_sasem lirc_devices_sb0540 lirc_devices_serial lirc_devices_silitek lirc_devices_sir lirc_devices_slinke lirc_devices_streamzap lirc_devices_tekram lirc_devices_tekram_bt829 lirc_devices_tira lirc_devices_ttusbir lirc_devices_tuxbox lirc_devices_tvbox lirc_devices_udp lirc_devices_uirt2 lirc_devices_uirt2_raw lirc_devices_usb_uirt_raw lirc_devices_usbx lirc_devices_wpc8769l lirc_devices_zotac lirc_devices_serial_igor_cesko lirc_devices_remote_wonder_plus lirc_devices_xboxusb lirc_devices_inputlirc kernel_linux kernel_linux kernel_linux
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=lirc_devices_all? ( !lirc_devices_userspace !lirc_devices_accent !lirc_devices_act200l !lirc_devices_act220l !lirc_devices_adaptec !lirc_devices_alsa_usb !lirc_devices_animax !lirc_devices_asusdh !lirc_devices_atilibusb !lirc_devices_atiusb !lirc_devices_audio !lirc_devices_audio_alsa !lirc_devices_avermedia !lirc_devices_avermedia_vdomate !lirc_devices_avermedia98 !lirc_devices_awlibusb !lirc_devices_bestbuy !lirc_devices_bestbuy2 !lirc_devices_breakoutbox !lirc_devices_bte !lirc_devices_bw6130 !lirc_devices_caraca !lirc_devices_chronos !lirc_devices_commandir !lirc_devices_cph06x !lirc_devices_creative !lirc_devices_creative_infracd !lirc_devices_devinput !lirc_devices_digimatrix !lirc_devices_dsp !lirc_devices_dvico !lirc_devices_ea65 !lirc_devices_ene0100 !lirc_devices_exaudio !lirc_devices_flyvideo !lirc_devices_ftdi !lirc_devices_gvbctv5pci !lirc_devices_hauppauge !lirc_devices_hauppauge_dvb !lirc_devices_hercules_smarttv_stereo !lirc_devices_i2cuser !lirc_devices_igorplugusb !lirc_devices_iguanaIR !lirc_devices_imon !lirc_devices_imon_24g !lirc_devices_imon_knob !lirc_devices_imon_lcd !lirc_devices_imon_pad !lirc_devices_imon_rsc !lirc_devices_irdeo !lirc_devices_irdeo_remote !lirc_devices_irlink !lirc_devices_irman !lirc_devices_irreal !lirc_devices_it87 !lirc_devices_ite8709 !lirc_devices_knc_one !lirc_devices_kworld !lirc_devices_leadtek_0007 !lirc_devices_leadtek_0010 !lirc_devices_leadtek_pvr2000 !lirc_devices_livedrive_midi !lirc_devices_livedrive_seq !lirc_devices_logitech !lirc_devices_macmini !lirc_devices_mediafocusI !lirc_devices_mouseremote !lirc_devices_mouseremote_ps2 !lirc_devices_mp3anywhere !lirc_devices_mplay !lirc_devices_nslu2 !lirc_devices_packard_bell !lirc_devices_parallel !lirc_devices_pcmak !lirc_devices_pcmak_usb !lirc_devices_pctv !lirc_devices_pixelview_bt878 !lirc_devices_pixelview_pak !lirc_devices_pixelview_pro !lirc_devices_provideo !lirc_devices_realmagic !lirc_devices_remotemaster !lirc_devices_sa1100 !lirc_devices_samsung !lirc_devices_sasem !lirc_devices_sb0540 !lirc_devices_serial !lirc_devices_silitek !lirc_devices_sir !lirc_devices_slinke !lirc_devices_streamzap !lirc_devices_tekram !lirc_devices_tekram_bt829 !lirc_devices_tira !lirc_devices_ttusbir !lirc_devices_tuxbox !lirc_devices_tvbox !lirc_devices_udp !lirc_devices_uirt2 !lirc_devices_uirt2_raw !lirc_devices_usb_uirt_raw !lirc_devices_usbx !lirc_devices_wpc8769l !lirc_devices_zotac !lirc_devices_serial_igor_cesko !lirc_devices_remote_wonder_plus !lirc_devices_xboxusb !lirc_devices_inputlirc )
-SLOT=0
-SRC_URI=mirror://sourceforge/lirc/lirc-0.9.0.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 linux-mod 8ce5c5f548ed010d6499eb792ac1a638 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89e7379ad02cd047360fe27d7e4cbcc5
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
new file mode 100644
index 000000000000..5a166f2416a4
--- /dev/null
+++ b/app-misc/lirc/Manifest
@@ -0,0 +1,28 @@
+AUX irexec-confd 280 BLAKE2B ad6663659c459811710a257cf357ddd5efbd17c09201c6e3ecc68d680004e8212e76365e09984b6c422fb5fa9603245c7443d1b71bb6064a2ed35734ab6dd630 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac
+AUX irexec-initd-0.8.6-r2 703 BLAKE2B c13b5348222f18d9883bc59f5db73ed1aa98f880c878f7059e0f150a9a0903395739a2364c2a9ce8d305f0d363bbc6aa676b20e4f70b941505770e30003897f9 SHA512 2d06c0bedbd2af9120caa54c049815a2bd920054afbcbd6b0bc1a48dab479527aea5e4fc7065428742f8d46032476ee37fb075669e93e16b2df5bfb8b572f86a
+AUX irexec-initd-0.9.4a-r2 681 BLAKE2B d2bf21ab1fe275bf5afea31a890c1de3300e836879b76c1c33bb40a59d9ad2b33285745a4d0a78f8bc2f589ba44e6fde31c7d07a02d9751e4b13b23975b1d9aa SHA512 0514712ce1a3e147e1c798319f90663baab7509299e2eb35551a716cf208e42b225f8539968bba1bd15270006fb728ff2f458015fb07bf325df8b0e095f5a206
+AUX irexec.service 140 BLAKE2B 6ee184023b77da18b2447704165fbda27b6b19ae70f0ae99fd3f07f046e80c480fa851a3315fda6c20c5d68c8186d200bb2637ae2249f993338e08ee62b1c345 SHA512 573e037d7132d216f095e4af370cdd020d72eca4ca6dfb1a652d6cd3f533b7d86491469a14d86419406561a6fb6500567e5e38a13b8dd0c99c63ff8494562249
+AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 BLAKE2B 1041002d814fef683eefd409874783d5d3fc4fccfdc740d6d499628399c86a1b2a99243894752753cb6c0eef549e6293474d13ec0a92cb3c87202fc4b1010c67 SHA512 f1c5b03eafb8fb9d4190e438fb4ca734cac102c7f3a097f193a0a1ac7cdee33b01fb1d794959e00be16c78bb66e34d113f3ff8fb87678e99f82670ec0306e3ca
+AUX lirc-0.8.4-portaudio_check.patch 769 BLAKE2B 08450f17818ef2525af534345bd5e5544416b0fa6f91a854f98ce0b03667458cb54aa565a581f35169581f4ec7bb71bda365c41b00378bc2c5cac9ec19895924 SHA512 a4e63da5d03f1fbb072679c3a415ae55767d601512f158c5e2fc52a045b632a055b94dca4e9d0d236ceeeb367daf22d4cc71f542229edb4fb13410512a8e4f0b
+AUX lirc-0.9.0-add-zotac-support.patch 19305 BLAKE2B aa968c0fe02057c3310731bdab00bc196657a826c28746e0038c9b72b85140669fc008b69e90c0bbf28bc222424a149b78014367eea7ccc551cdd53102f139eb SHA512 72ac76eba13ed043630b10adad7a8a0df9183c7b2eeab1cc2bee3f7d6a97d56382debcf61aa4a2d6068d85bbd8d592ee425f34a6ac6eabcbf0a300ed6fb208cb
+AUX lirc-0.9.0-atiusb_kfifo.patch 437 BLAKE2B c2215e718924e5185cef1f5b80428902c20b3b69d313ee9f8fe0d98d5553bdf03ec64ac359c3e42c78e40c6d9d1b0f38986387e15a95e630796e3b2148688004 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02
+AUX lirc-0.9.0-fixed-font.patch 630 BLAKE2B 39e12cca466fbee96112395104b2055997ec6941465782ecb928de4793cba29203f5f99d280d530fbaadf5d2377d1e25a88e4897c103d3d12fbf0a6cfcd8e6e9 SHA512 782eb14bd540f202a3df71ce801a42b9adca17fa25a79265af6a3b0ed6b503a67b46a0d29ac6b4607862b712a3511a3a3f16cdc7bef70ba1e43967be11971ed4
+AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 BLAKE2B db4c75de0f7c2de3b99f50b17321ec1cd93bbba480536f533c64d07e8cac8fe1710f03d1f91005e5ff7db52ea906799aaf08ff1a6174fa4a2676d8f6f77da601 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354
+AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 BLAKE2B 400ef11e93b9cc58bbfa7f414df66208d1ad6fe14301b85dd05599b400aa1ecf6299b1e9692945f10f4b7ed085e8e087b0cdf218644bea0b7f785e00959d2be3 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae
+AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 BLAKE2B ebfc117d5f1f1abe2a456ea6b5ed730ec22ebe03fee976eaf9005464afbfe5519f290cb5a107946286b8632a695d2f352ddb8581f63c429f75a7080d1916189b SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df
+AUX lirc-0.9.0-kernel-3.8-fixes.patch 2727 BLAKE2B 26601a6e34f0dadad36de1efa9b9a43127643a5c548372d9a64b2b919ddcef3d412ccd4bd59e8c18cd9d5fb9a41efe2d213a3f91397d9067a5851aa84b7832fe SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc
+AUX lirc.service 216 BLAKE2B f1ee64926ab99eaeb5604f93d6394994eff97b9e5ae5b32a10d066e143e66278114722e15c3757815911ebc0485fde43c1f10e8abecf4a90550ccf4c08c5aa1b SHA512 c3e43d24f562ba5ac7e0f12d160026ebf5db00fe066d9e28e0cbb6767fb272474103ad271fba10b970a6613f6e4545150d61b7aa096c696fddca4f2db8019e49
+AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
+AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
+AUX lircm.service 174 BLAKE2B 30db4e9dd3eed5ae896f60d2363d25f5bf11c83b946e668e7b13e31465682405eb1e5bb436c8987a59ddf9be6e0032745a5867cbeca978ccaf9c47e8eb24633c SHA512 8baccd7138fb9095c99f4f0a8ef398114dfa2bba798f23e07d41d6a7433242e2e1f071d44e1b336fb2a36b30c650ed01f2ccdb1ed365e590f85007c012343db5
+AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047339487451b093455761b92660e3f3571c7884b97e6c79cbf7415bff6bcc6ad5198ddd43 SHA512 2f4aae24982a51c54fa59ddd8a48190c11f86ac67fc25bbb599f750be5b91e457c2f779e915943803bde2ec3e5e8988f3c0ffb9d1ea4a08c2e7f05cd3e8b75a5
+AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
+AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
+AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
+DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
+DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
+DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
+EBUILD lirc-0.10.0.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
+EBUILD lirc-0.10.1.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
+EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
+MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
diff --git a/app-misc/lirc/files/irexec-confd b/app-misc/lirc/files/irexec-confd
new file mode 100644
index 000000000000..48eb8dd4c806
--- /dev/null
+++ b/app-misc/lirc/files/irexec-confd
@@ -0,0 +1,9 @@
+# Options to pass to the irexec process
+IREXEC_OPTS="/etc/lircrc"
+
+# User to execute irexec as.
+# Warning: Running irexec as root can open security holes
+#IREXEC_USER="root"
+
+# Use this to disable the warning printed when starting irexec as root
+# IREXEC_DISABLE_ROOT_WARNING=yes
diff --git a/app-misc/lirc/files/irexec-initd-0.8.6-r2 b/app-misc/lirc/files/irexec-initd-0.8.6-r2
new file mode 100644
index 000000000000..e62497306d0f
--- /dev/null
+++ b/app-misc/lirc/files/irexec-initd-0.8.6-r2
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de>
+# Distributed under the terms of the GNU General Public License v2
+
+: ${IREXEC_USER:=root}
+
+depend() {
+ need lirc
+}
+
+start() {
+ if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then
+ ewarn "Warning: Running irexec as root can open security holes"
+ fi
+
+ ebegin "Starting irexec"
+ start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \
+ --exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS}
+ eend $? "Failed to start irexec."
+}
+
+stop() {
+ ebegin "Stopping irexec"
+ start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER}
+ eend $? "Failed to stop irexec."
+}
+
diff --git a/app-misc/lirc/files/irexec-initd-0.9.4a-r2 b/app-misc/lirc/files/irexec-initd-0.9.4a-r2
new file mode 100644
index 000000000000..01234c3264fa
--- /dev/null
+++ b/app-misc/lirc/files/irexec-initd-0.9.4a-r2
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de>
+# Distributed under the terms of the GNU General Public License v2
+
+: ${IREXEC_USER:=root}
+
+depend() {
+ need lircd
+}
+
+start() {
+ if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then
+ ewarn "Warning: Running irexec as root can open security holes"
+ fi
+
+ ebegin "Starting irexec"
+ start-stop-daemon --start --user ${IREXEC_USER} --chdir / \
+ --exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS}
+ eend $? "Failed to start irexec."
+}
+
+stop() {
+ ebegin "Stopping irexec"
+ start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER}
+ eend $? "Failed to stop irexec."
+}
+
diff --git a/app-misc/lirc/files/irexec.service b/app-misc/lirc/files/irexec.service
new file mode 100644
index 000000000000..53dac65dc234
--- /dev/null
+++ b/app-misc/lirc/files/irexec.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=IR Exec
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/bin/irexec
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
new file mode 100644
index 000000000000..66527bcc5709
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
@@ -0,0 +1,26 @@
+--- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig 2005-10-29 08:18:53.000000000 -0600
++++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c 2006-04-01 14:31:05.000000000 -0700
+@@ -147,8 +147,9 @@
+ /* init strings */
+ #define USB_OUTLEN 7
+
+-static char init1[] = {0x01, 0x00, 0x20, 0x14};
+-static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
++static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
++static char init2[] = {0x83, 0x03};
++static char init3[] = {0x84, 0xd7, 0x020};
+
+ struct in_endpt {
+ /* inner link in list of endpoints for the remote specified by ir */
+@@ -1034,8 +1034,9 @@
+ usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf,
+ USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval);
+
+- send_packet(oep, 0x8004, init1);
+- send_packet(oep, 0x8007, init2);
++ send_packet(oep, 0x8007, init1);
++ send_packet(oep, 0x8002, init2);
++ send_packet(oep, 0x8003, init3);
+ }
+ }
+
diff --git a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
new file mode 100644
index 000000000000..36f5f360cd18
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
@@ -0,0 +1,18 @@
+Portaudio is only needed for LIRC_DEVICES=audio, so not checking for Portaudio when the device is disabled will prevent automagic dependencies.
+--- configure.ac.orig 2009-03-13 10:02:50.000000000 +0100
++++ configure.ac 2009-03-13 10:04:00.000000000 +0100
+@@ -336,14 +336,6 @@
+ AC_DEFINE(HAVE_LIBIRMAN_SW)
+ possible_drivers="${possible_drivers} (irman_sw)"
+ )
+-dnl audio driver requires PortAudio library installed and some linker flags
+-AC_CHECK_HEADERS(portaudio.h,[
+- AC_CHECK_LIB(portaudio, Pa_Initialize,[
+- AC_DEFINE(HAVE_LIBPORTAUDIO)
+- possible_drivers="${possible_drivers} (audio)"
+- ],,${portaudio_lib_other}
+- )]
+-)
+ dnl audio_alsa driver requires ALSA library installed and some linker flags
+ have_alsa=no
+ AC_CHECK_HEADERS(alsa/asoundlib.h,[
diff --git a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
new file mode 100644
index 000000000000..381860ced6fb
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
@@ -0,0 +1,658 @@
+diff -rupN base/configure.ac mod/configure.ac
+--- base/configure.ac 2011-03-25 23:28:18.000000000 +0100
++++ mod/configure.ac 2013-03-21 16:25:07.218419985 +0100
+@@ -383,7 +383,7 @@ AC_CHECK_HEADERS(linux/input.h,[
+ dnl check if hiddev is available
+ AC_CHECK_HEADERS([linux/types.h])
+ AC_CHECK_HEADERS([linux/hiddev.h],[
+- possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini)"
++ possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini) (zotac)"
+ AC_MSG_CHECKING(for HIDDEV_FLAG_UREF support)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <linux/types.h>
+@@ -393,7 +393,7 @@ AC_CHECK_HEADERS([linux/hiddev.h],[
+ ]])],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_LINUX_HIDDEV_FLAG_UREF)
+- possible_drivers="${possible_drivers} (samsung) (sb0540)"
++ possible_drivers="${possible_drivers} (samsung) (sb0540) (zotac)"
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+@@ -446,7 +446,7 @@ AC_ARG_WITH(driver,
+ srm7500libusb, tekram,
+ tekram_bt829, tira, tira_raw, ttusbir,
+ tuxbox, tvbox, udp, uirt2, uirt2_raw,
+- usb_uirt_raw, usbx, wpc8769l],
++ usb_uirt_raw, usbx, wpc8769l, zotac],
+ driver=${withval},
+ driver="unset"
+ )
+@@ -464,6 +464,7 @@ portaudio_lib=""
+ alsa_lib=""
+ atilibusb_lib=""
+ atwf83_lib=""
++zotac_lib=""
+ awlibusb_lib=""
+ dfclibusb_lib=""
+ srm7500libusb_lib=""
+@@ -683,6 +684,10 @@ if test "$driver" = "userspace" -o "$dri
+ usbx)
+ hw_module="${hw_module} hw_usbx.o serial.o"
+ ;;
++ zotac)
++ hw_module="${hw_module} hw_zotac.o"
++ zotac_lib=-lpthread
++ ;;
+ esac
+ done
+ #remove duplicates
+@@ -733,6 +738,14 @@ if test "$driver" = "alsa_usb"; then
+ lircd_conf="creative/lircd.conf.alsa_usb"
+ fi
+
++if test "$driver" = "zotac"; then
++ lirc_driver="$driver"
++ hw_module="hw_zotac.o"
++ HW_DEFAULT="hw_zotac"
++ lircd_conf="zotac/lircd.conf.zotac"
++ zotac_lib=-lpthread
++fi
++
+ if test "$driver" = "animax"; then
+ lirc_driver="lirc_dev lirc_serial"
+ lircd_conf="animax/lircd.conf.animax"
+@@ -1499,6 +1512,7 @@ if test "$lirc_driver" = "none" || \
+ test "$lirc_driver" = "macmini" || \
+ test "$lirc_driver" = "samsung" || \
+ test "$lirc_driver" = "sb0540" || \
++ test "$lirc_driver" = "zotac" || \
+ test "$lirc_driver" = "srm7500libusb" || \
+ test "$lirc_driver" = "userspace"; then
+ lirc_driver=
+@@ -1669,7 +1683,7 @@ if ! echo ${hw_module}|grep " receive.o"
+ receive="receive.o"
+ fi
+
+-hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib}"
++hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib} ${zotac_lib}"
+
+ dnl tell the Makefiles what we decided
+ AC_SUBST(daemon)
+diff -rupN base/daemons/Makefile.am mod/daemons/Makefile.am
+--- base/daemons/Makefile.am 2011-03-25 23:28:18.000000000 +0100
++++ mod/daemons/Makefile.am 2013-03-21 16:25:40.488790784 +0100
+@@ -58,7 +58,8 @@ EXTRA_libhw_module_a_SOURCES = \
+ hw_usbx.c hw_usbx.h \
+ receive.c receive.h \
+ transmit.c transmit.h \
+- serial.c serial.h
++ serial.c serial.h \
++ hw_zotac.c
+
+ libhw_module_a_LIBADD = @hw_module@
+ libhw_module_a_DEPENDENCIES = @hw_module@
+diff -rupN base/daemons/hw-types.c mod/daemons/hw-types.c
+--- base/daemons/hw-types.c 2011-03-25 23:28:18.000000000 +0100
++++ mod/daemons/hw-types.c 2013-03-21 16:26:38.913200218 +0100
+@@ -59,6 +59,7 @@ extern struct hardware hw_uirt2;
+ extern struct hardware hw_uirt2_raw;
+ extern struct hardware hw_usb_uirt_raw;
+ extern struct hardware hw_usbx;
++extern struct hardware hw_zotac;
+
+ #ifndef HW_DEFAULT
+ # define HW_DEFAULT hw_default
+@@ -160,6 +161,7 @@ struct hardware *hw_list[] = {
+ #ifdef HAVE_LINUX_HIDDEV_FLAG_UREF
+ &hw_samsung,
+ &hw_sb0540,
++ &hw_zotac,
+ #endif
+ &hw_silitek,
+ #ifdef HAVE_LIBUSB
+diff -rupN base/daemons/hw_zotac.c mod/daemons/hw_zotac.c
+--- base/daemons/hw_zotac.c 1970-01-01 01:00:00.000000000 +0100
++++ mod/daemons/hw_zotac.c 2013-03-21 16:31:06.989272556 +0100
+@@ -0,0 +1,429 @@
++/****************************************************************************
++ ** hw_zotac.c *************************************************************
++ ****************************************************************************
++ *
++ * Lirc driver for Zotac remote
++ *
++ * Copyright (C) 2010 Rainer Hochecker
++ *
++ * Distribute under GPL version 2 or later.
++ *
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include <stdio.h>
++#include <pthread.h>
++#include <sys/fcntl.h>
++#include <signal.h>
++#include <linux/hiddev.h>
++#include <sys/ioctl.h>
++#include "hardware.h"
++#include "ir_remote.h"
++#include "lircd.h"
++
++enum {
++ RPT_NO = 0,
++ RPT_YES = 1,
++};
++
++static int zotac_init();
++static int zotac_deinit();
++static char *zotac_rec(struct ir_remote *remotes);
++static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp,
++ lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp);
++static void *zotac_repeat();
++static int zotac_getcode();
++
++/** Max number of repetitions */
++static unsigned max_repeat_count = 500;
++/** Code that triggers key release */
++static unsigned release_code = 0x00000000;
++/** Code that triggers device remove */
++static unsigned remove_code =0x00FFFFFF;
++/** Time to wait before first repetition */
++static unsigned repeat_time1_us = 500000;
++/** Time to wait between two repetitions */
++static unsigned repeat_time2_us = 100000;
++/** Pipe between main thread and repetition thread */
++static int fd_pipe[2] = { -1, -1 };
++
++/** Thread that simulates repetitions */
++static pthread_t repeat_thread;
++/** File descriptor for the real device */
++static int fd_hidraw;
++
++static int main_code_length = 32;
++static signed int main_code = 0;
++static struct timeval start, end, last;
++static int repeat_state = RPT_NO;
++static int error_state = 0;
++static int probe_code = 0;
++
++#ifdef HAVE_LINUX_HIDDEV_FLAG_UREF
++/* Zotac USB iR Receiver */
++struct hardware hw_zotac = {
++ "/dev/usb/hiddev0", /* "device" */
++ -1, /* fd (device) */
++ LIRC_CAN_REC_LIRCCODE, /* features */
++ 0, /* send_mode */
++ LIRC_MODE_LIRCCODE, /* rec_mode */
++ 32, /* code_length */
++ zotac_init, /* init_func */
++ zotac_deinit, /* deinit_func */
++ NULL, /* send_func */
++ zotac_rec, /* rec_func */
++ zotac_decode, /* decode_func */
++ NULL, /* ioctl_func */
++ NULL, /* readdata */
++ "zotac" /* name */
++};
++#endif
++
++static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp,
++ lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp)
++{
++ LOGPRINTF(1, "zotac_decode");
++
++ if (!map_code(remote, prep, codep, postp, 0, 0, main_code_length, main_code, 0, 0)) {
++ return 0;
++ }
++
++ map_gap(remote, &start, &last, 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);
++ /* override repeat */
++ *repeat_flagp = repeat_state;
++
++ return 1;
++}
++
++static int zotac_getcode() {
++
++ ssize_t rd;
++ struct hiddev_usage_ref uref;
++ struct hiddev_report_info rinfo;
++ struct hiddev_field_info finfo;
++ int shift = 0;
++
++ rd = read(fd_hidraw, &uref, sizeof(uref));
++ if (rd < 0) {
++ logprintf(LOG_ERR, "error reading '%s'", hw.device);
++ logperror(LOG_ERR, NULL);
++ zotac_deinit();
++ error_state = 1;
++ return -1;
++ }
++
++ if (uref.field_index == HID_FIELD_INDEX_NONE) {
++ /*
++ * we get this when the new report has been send from
++ * device at this point we have the uref structure
++ * prefilled with correct report type and id
++ *
++ */
++
++ switch (uref.report_id) {
++ case 1: /* USB standard keyboard usage page */
++ {
++ /* This page reports cursor keys */
++ LOGPRINTF(3, "Keyboard (standard)\n");
++
++ /* check for special codes */
++ uref.field_index = 0;
++ uref.usage_index = 1;
++ /* fetch the usage code for given indexes */
++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref));
++ /* fetch the value from report */
++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref));
++
++ if (uref.value)
++ shift = 1;
++
++ /* populate required field number */
++ uref.field_index = 1;
++ uref.usage_index = 0;
++ /* fetch the usage code for given indexes */
++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref));
++ /* fetch the value from report */
++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref));
++ /* now we have the key */
++
++ LOGPRINTF(3, "usage: %x value: %x shift: %d\n",uref.usage_code, uref.value, shift);
++
++ /* now we have the key */
++ if (uref.value) {
++ probe_code = (uref.usage_code | uref.value);
++ if (shift)
++ probe_code |= 0x10000000;
++ LOGPRINTF(3, "Main code 1: %x\n", probe_code);
++ return 1;
++ }
++ else {
++ LOGPRINTF(3, "rel button\n");
++ probe_code = release_code;
++ return 2;
++ }
++ }
++ break;
++
++ case 2:
++ case 3: /* USB generic desktop usage page */
++ case 4:
++ {
++ /* This page reports power key
++ * (via SystemControl SLEEP)
++ */
++ LOGPRINTF(3, "Generic desktop (standard)\n");
++
++
++ /* traverse report descriptor */
++ rinfo.report_type = HID_REPORT_TYPE_INPUT;
++ rinfo.report_id = HID_REPORT_ID_FIRST;
++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
++
++ unsigned int i,j;
++ while (rd >= 0) {
++ for (i = 0; i < rinfo.num_fields; i++) {
++ finfo.report_type = rinfo.report_type;
++ finfo.report_id = rinfo.report_id;
++ finfo.field_index = i;
++ ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo);
++ for (j = 0; j < finfo.maxusage; j++) {
++ uref.field_index = i;
++ uref.usage_index = j;
++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref);
++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref);
++
++ if (uref.value != 0) {
++ LOGPRINTF(3, "field: %d, idx: %d, usage: %x value: %x\n",i, j, uref.usage_code, uref.value);
++ probe_code = uref.usage_code;
++ return 1;
++ }
++ }
++ }
++ rinfo.report_id |= HID_REPORT_ID_NEXT;
++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
++ }
++ return 2;
++ }
++ break;
++ default:
++ /* Unknown/unsupported report id.
++ * Should not happen because remaining reports
++ * from report descriptor seem to be unused by remote.
++ */
++ logprintf(LOG_ERR, "Unexpected report id %d", uref.report_id);
++ break;
++ }
++ }
++ else {
++ /* This page reports power key
++ * (via SystemControl SLEEP)
++ */
++ LOGPRINTF(3, "Same Event ...\n");
++
++ /* traverse report descriptor */
++ rinfo.report_type = HID_REPORT_TYPE_INPUT;
++ rinfo.report_id = HID_REPORT_ID_FIRST;
++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
++
++ unsigned int i,j;
++ while (rd >= 0) {
++ for (i = 0; i < rinfo.num_fields; i++) {
++ finfo.report_type = rinfo.report_type;
++ finfo.report_id = rinfo.report_id;
++ finfo.field_index = i;
++ ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo);
++ for (j = 0; j < finfo.maxusage; j++) {
++ uref.field_index = i;
++ uref.usage_index = j;
++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref);
++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref);
++
++ if (uref.value != 0) {
++ LOGPRINTF(3, "usage: %x value: %x\n",uref.usage_code, uref.value);
++ //probe_code = uref.usage_code;
++ return 0;
++ }
++ }
++ }
++ rinfo.report_id |= HID_REPORT_ID_NEXT;
++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
++ }
++ return 2;
++ }
++ return 0;
++}
++
++static int zotac_init()
++{
++ logprintf(LOG_INFO, "zotac initializing '%s'", hw.device);
++ if ((fd_hidraw = open(hw.device, O_RDONLY)) < 0) {
++ logprintf(LOG_ERR, "unable to open '%s'", hw.device);
++ return 0;
++ }
++ int flags = HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT;
++ if (ioctl(fd_hidraw, HIDIOCSFLAG, &flags)) {
++ return 0;
++ }
++ hw.fd = fd_hidraw;
++
++ /* Create pipe so that events sent by the repeat thread will
++ trigger main thread */
++ if (pipe(fd_pipe) != 0) {
++ logperror(LOG_ERR, "couldn't open pipe");
++ close(fd_hidraw);
++ return 0;
++ }
++ hw.fd = fd_pipe[0];
++ /* Create thread to simulate repetitions */
++ if (pthread_create(&repeat_thread, NULL, zotac_repeat, NULL)) {
++ logprintf(LOG_ERR, "Could not create \"repeat thread\"");
++ return 0;
++ }
++ return 1;
++}
++
++static int zotac_deinit()
++{
++ pthread_cancel(repeat_thread);
++ if (fd_hidraw != -1) {
++ // Close device if it is open
++ logprintf(LOG_INFO, "closing '%s'", hw.device);
++ close(fd_hidraw);
++ fd_hidraw = -1;
++ }
++ // Close pipe input
++ if (fd_pipe[1] >= 0) {
++ close(fd_pipe[1]);
++ fd_pipe[1] = -1;
++ }
++ // Close pipe output
++ if (fd_pipe[0] >= 0) {
++ close(fd_pipe[0]);
++ fd_pipe[0] = -1;
++ }
++ hw.fd = -1;
++ return 1;
++}
++
++/**
++ * Runtime that reads device, forwards codes to main thread
++ * and simulates repetitions.
++ */
++static void *zotac_repeat()
++{
++ int repeat_count = 0;
++ unsigned current_code;
++ int ret;
++ int sel;
++ fd_set files;
++ struct timeval delay;
++ int pressed = 0;
++ int fd = fd_pipe[1];
++
++ while (1) {
++ // Initialize set to monitor device's events
++ FD_ZERO(&files);
++ FD_SET(fd_hidraw, &files);
++ if (pressed) {
++ sel = select(FD_SETSIZE, &files, NULL, NULL, &delay);
++ } else {
++ sel = select(FD_SETSIZE, &files, NULL, NULL, NULL);
++ }
++
++ switch (sel) {
++ case 1:
++ // Data ready in device's file
++ ret = zotac_getcode();
++
++ if (ret < 0) {
++ // Error
++ logprintf(LOG_ERR, "(%s) Could not read %s", __FUNCTION__, hw.device);
++ goto exit_loop;
++ }
++ if (ret == 1) {
++ // Key code : forward it to main thread
++ pressed = 1;
++ repeat_count = 0;
++ delay.tv_sec = 0;
++ delay.tv_usec = repeat_time1_us;
++ current_code = probe_code;
++ } else if (ret == 2) {
++ // Release code : stop repetitions
++ pressed = 0;
++ current_code = release_code;
++ } else if (ret == 0) {
++ continue;
++ }
++ break;
++ case 0:
++ repeat_count++;
++ if (repeat_count >= max_repeat_count) {
++ // Too many repetitions, something must have gone wrong
++ logprintf(LOG_ERR,"(%s) too many repetitions", __FUNCTION__);
++ goto exit_loop;
++ }
++ // Timeout : send current_code again to main
++ // thread to simulate repetition
++ delay.tv_sec = 0;
++ delay.tv_usec = repeat_time2_us;
++ break;
++ default:
++ // Error
++ logprintf(LOG_ERR, "(%s) select() failed", __FUNCTION__);
++ goto exit_loop;
++ }
++ // Send code to main thread through pipe
++ write(fd, &current_code, sizeof(current_code));
++ }
++exit_loop:
++
++ // Wake up main thread with special key code
++ current_code = remove_code;
++ write(fd, &current_code, sizeof(current_code));
++ return NULL;
++}
++
++/*
++* Aureal Technology ATWF@83 cheap remote
++* specific code.
++*/
++
++static char *zotac_rec(struct ir_remote *remotes)
++{
++ unsigned ev;
++ int rd;
++ last = end;
++ gettimeofday(&start, NULL);
++ rd = read(hw.fd, &ev, sizeof(ev));
++
++ if (rd == -1) {
++ // Error
++ logprintf(LOG_ERR, "(%s) could not read pipe", __FUNCTION__);
++ zotac_deinit();
++ return 0;
++ }
++
++ if (ev == release_code) {
++ // Release code
++ main_code = 0;
++ return 0;
++ } else if (ev == remove_code) {
++ // Device has been removed
++ zotac_deinit();
++ return 0;
++ }
++
++ LOGPRINTF(1, "zotac : %x", ev);
++ // Record the code and check for repetition
++ if (main_code == ev) {
++ repeat_state = RPT_YES;
++ } else {
++ main_code = ev;
++ repeat_state = RPT_NO;
++ }
++ gettimeofday(&end, NULL);
++ return decode_all(remotes);
++}
+diff -rupN base/remotes/zotac/lircd.conf.zotac mod/remotes/zotac/lircd.conf.zotac
+--- base/remotes/zotac/lircd.conf.zotac 1970-01-01 01:00:00.000000000 +0100
++++ mod/remotes/zotac/lircd.conf.zotac 2013-03-21 16:31:31.343367869 +0100
+@@ -0,0 +1,77 @@
++
++# Please make this file available to others
++# by sending it to <lirc@bartelmus.de>
++#
++# this config file was automatically generated
++# using lirc-0.9.1-git(zotac) on Mon Apr 2 14:10:29 2012
++#
++# contributed by
++#
++# brand: zotac.conf
++# model no. of remote control:
++# devices being controlled by this remote:
++#
++
++begin remote
++
++ name zotac.conf
++ bits 32
++ eps 30
++ aeps 100
++
++ one 0 0
++ zero 0 0
++ gap 100123
++ min_repeat 9
++# suppress_repeat 9
++# uncomment to suppress unwanted repeats
++# toggle_bit_mask 0x7004F
++
++ begin codes
++ KEY_SLEEP 0x00010082
++ KEY_WAKEUP 0x00010083
++ KEY_RECORD 0x000C00B2
++ KEY_PAUSE 0x000C00B1
++ KEY_STOP 0x000C00B7
++ KEY_REWIND 0x000C00B4
++ KEY_PLAY 0x000C00B0
++ KEY_FORWARD 0x000C00B3
++ KEY_LEFTSHIFT 0x000C00B6
++ KEY_RIGHTSHIFT 0x000C00B5
++ KEY_BACK 0x000C0224
++ KEY_INFO 0x000C0209
++ KEY_MENU 0xFFBC000D
++ KEY_UP 0x00070052
++ KEY_LEFT 0x00070050
++ KEY_RIGHT 0x0007004F
++ KEY_DOWN 0x00070051
++ KEY_OK 0x00070028
++ KEY_VOLUMEUP 0x000C00E9
++ KEY_VOLUMEDOWN 0x000C00EA
++ KEY_MUTE 0x000C00E2
++ KEY_CHANNELUP 0x000C009C
++ KEY_CHANNELDOWN 0x000C009D
++ KEY_1 0x0007001E
++ KEY_2 0x0007001F
++ KEY_3 0x00070020
++ KEY_4 0x00070021
++ KEY_5 0x00070022
++ KEY_6 0x00070023
++ KEY_7 0x00070024
++ KEY_8 0x00070025
++ KEY_9 0x00070026
++ KEY_0 0x00070027
++ KEY_NUMERIC_STAR 0x10070025
++ KEY_NUMERIC_POUND 0x10070020
++ KEY_CLEAR 0x00070029
++ KEY_TEXT 0xFFBC005A
++ KEY_TITLE 0x000C008D
++ KEY_ENTER 0x00070028
++ KEY_RED 0xFFBC005B
++ KEY_GREEN 0xFFBC005C
++ KEY_YELLOW 0xFFBC005D
++ KEY_BLUE 0xFFBC005E
++ end codes
++
++end remote
++
+diff -rupN base/setup.data mod/setup.data
+--- base/setup.data 2011-03-25 23:28:18.000000000 +0100
++++ mod/setup.data 2013-03-21 16:28:11.433935463 +0100
+@@ -146,6 +146,7 @@ hw_menu_entry: @hw-usb
+ usb_uirt_raw: "USB-UIRT"
+ mplay: "VLSystem MPlay Blast"
+ mplay: "VLSystem MPlay Mini"
++ zotac: "Zotac USB IR Receiver"
+
+ param_type: \
+ act200l \
+@@ -260,7 +261,8 @@ param_type: \
+ ttusbir \
+ tvbox \
+ udp \
+- wpc8769l
++ wpc8769l \
++ zotac
+ none:
+
+ default_param: \
+@@ -331,7 +333,8 @@ default_param: \
+ ttusbir \
+ tvbox \
+ udp \
+- wpc8769l
++ wpc8769l \
++ zotac
+ none:
+
+ default_param: \
diff --git a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
new file mode 100644
index 000000000000..32edb244b412
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
@@ -0,0 +1,14 @@
+--- a/drivers/lirc_atiusb/lirc_atiusb.c 2012-07-17 16:04:39.000000000 -0400
++++ b/drivers/lirc_atiusb/lirc_atiusb.c 2012-07-17 16:19:06.000000000 -0400
+@@ -1050,7 +1050,11 @@
+ goto new_irctl_failure_check;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
+ if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++#else
++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
++#endif
+ mem_failure = 4;
+ goto new_irctl_failure_check;
+ }
diff --git a/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch b/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch
new file mode 100644
index 000000000000..fd122e7362b6
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch
@@ -0,0 +1,20 @@
+--- a/tools/xmode2.c 2011-03-25 23:28:18.000000000 +0100
++++ b/tools/xmode2.c 2012-07-29 19:36:34.972246587 +0200
+@@ -69,7 +69,7 @@
+ Window w0, w1; /*w0 = root */
+ char w1_wname[] = "xmode2";
+ char w1_iname[] = "xmode2";
+-char font1_name[] = "-*-Courier-medium-r-*-*-8-*-*-m-*-iso8859-1";
++char font1_name[] = "fixed";
+
+ int w1_x = 0, w1_y = 0;
+ unsigned int w1_w = 640, w1_h = 480, w1_border = 0;
+@@ -201,7 +201,7 @@
+ printf("coudn't allocate blue color\n");
+ f1_str = XLoadQueryFont(d1, font1_name);
+ if (f1_str == NULL) {
+- printf("could't load font\n");
++ printf("couldn't load font\n");
+ exit(EXIT_FAILURE);
+ }
+
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch
new file mode 100644
index 000000000000..624737090bbe
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch
@@ -0,0 +1,67 @@
+diff -u a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
+--- a/drivers/lirc_atiusb/lirc_atiusb.c
++++ b/drivers/lirc_atiusb/lirc_atiusb.c
+@@ -48,7 +48,9 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/kmod.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+ #include <linux/smp_lock.h>
++#endif
+ #include <linux/completion.h>
+ #include <linux/uaccess.h>
+ #include <linux/usb.h>
+diff -u a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c
+--- a/drivers/lirc_i2c/lirc_i2c.c
++++ b/drivers/lirc_i2c/lirc_i2c.c
+@@ -555,8 +555,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+ kfree(ir);
+ return -EINVAL;
+ }
+- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
+- adap->id, addr, ir->c.name);
++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
++ addr, ir->c.name);
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ /* register device */
+diff -u a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -361,14 +361,22 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
+ size = count << 3;
+
+ ldata = (unsigned long *) data_buf;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+ next_one = generic_find_next_le_bit(ldata, size, 0);
++#else
++ next_one = find_next_zero_bit_le(ldata, size, 0);
++#endif
+
+ if (next_one > 0)
+ put_pulse_bit(next_one
+ * WPC8769L_USECS_PER_BIT);
+
+ while (next_one < size) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+ next_zero = generic_find_next_zero_le_bit(ldata,
++#else
++ next_zero = find_next_zero_bit_le(ldata,
++#endif
+ size, next_one + 1);
+
+ put_space_bit(
+@@ -376,7 +384,11 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
+ * WPC8769L_USECS_PER_BIT);
+
+ if (next_zero < size) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+ next_one = generic_find_next_le_bit(ldata,
++#else
++ next_one = find_next_bit_le(ldata,
++#endif
+ size, next_zero + 1);
+
+ put_pulse_bit(
+--
+1.7.5.4
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
new file mode 100644
index 000000000000..9b7d3ef1f539
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
@@ -0,0 +1,50 @@
+diff -ur drivers/lirc_serial/lirc_serial.c drivers.new/lirc_serial/lirc_serial.c
+--- drivers/lirc_serial/lirc_serial.c 2011-03-25 18:28:18.000000000 -0400
++++ drivers.new/lirc_serial/lirc_serial.c 2012-10-24 14:32:14.000000000 -0400
+@@ -66,7 +66,12 @@
+ #include <linux/poll.h>
+ #include <linux/platform_device.h>
+
++#include "drivers/kcompat.h"
++#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
++#include <asm/switch_to.h>
++#else
+ #include <asm/system.h>
++#endif
+ #include <linux/io.h>
+ #include <linux/irq.h>
+ #include <linux/fcntl.h>
+@@ -80,7 +85,6 @@
+ #define UART_IE_IXP42X_UUE 0x40 /* IXP42X UART Unit enable */
+ #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */
+
+-#include "drivers/kcompat.h"
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+ #include <media/lirc.h>
+ #include <media/lirc_dev.h>
+diff -ur drivers/lirc_sir/lirc_sir.c drivers.new/lirc_sir/lirc_sir.c
+--- drivers/lirc_sir/lirc_sir.c 2011-03-25 18:28:18.000000000 -0400
++++ drivers.new/lirc_sir/lirc_sir.c 2012-10-24 14:32:46.000000000 -0400
+@@ -59,7 +59,14 @@
+ #include <linux/mm.h>
+ #include <linux/delay.h>
+ #include <linux/poll.h>
++
++#include "drivers/kcompat.h"
++#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
++#include <asm/switch_to.h>
++#else
+ #include <asm/system.h>
++#endif
++
+ #include <linux/io.h>
+ #include <asm/irq.h>
+ #include <linux/fcntl.h>
+@@ -74,7 +81,6 @@
+
+ #include <linux/timer.h>
+
+-#include "drivers/kcompat.h"
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+ #include <media/lirc.h>
+ #include <media/lirc_dev.h>
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
new file mode 100644
index 000000000000..b06d94efb322
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
@@ -0,0 +1,12 @@
+--- a/drivers/kcompat.h 2011-03-25 18:28:18.000000000 -0400
++++ b/drivers/kcompat.h 2012-11-27 13:37:55.000000000 -0500
+@@ -136,4 +136,9 @@
+ )
+ #endif
+
++#ifndef err
++#define err(format, arg...) \
++ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
++#endif
++
+ #endif /* _KCOMPAT_H */
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
new file mode 100644
index 000000000000..bd11b61c19d8
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
@@ -0,0 +1,80 @@
+diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-05-24 11:58:31.017566567 -0400
++++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c 2013-05-24 12:00:38.733568898 -0400
+@@ -1107,12 +1107,12 @@
+
+ static struct platform_device *lirc_serial_dev;
+
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -1163,7 +1163,7 @@
+
+ static struct platform_driver lirc_serial_driver = {
+ .probe = lirc_serial_probe,
+- .remove = __devexit_p(lirc_serial_remove),
++ .remove = lirc_serial_remove,
+ .suspend = lirc_serial_suspend,
+ .resume = lirc_serial_resume,
+ .driver = {
+diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-05-24 11:58:31.017566567 -0400
++++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c 2013-05-24 12:00:38.733568898 -0400
+@@ -1296,19 +1296,19 @@
+ return 0;
+ }
+
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+ static struct platform_driver lirc_sir_driver = {
+ .probe = lirc_sir_probe,
+- .remove = __devexit_p(lirc_sir_remove),
++ .remove = lirc_sir_remove,
+ .driver = {
+ .name = "lirc_sir",
+ .owner = THIS_MODULE,
+diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-05-24 11:58:30.974566567 -0400
++++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-05-24 12:00:38.734568898 -0400
+@@ -942,12 +942,12 @@
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -975,7 +975,7 @@
+
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ .probe = lirc_wpc8769l_probe,
+- .remove = __devexit_p(lirc_wpc8769l_remove),
++ .remove = lirc_wpc8769l_remove,
+ .suspend = lirc_wpc8769l_suspend,
+ .resume = lirc_wpc8769l_resume,
+ .driver = {
diff --git a/app-misc/lirc/files/lirc.service b/app-misc/lirc/files/lirc.service
new file mode 100644
index 000000000000..e184dfc09d44
--- /dev/null
+++ b/app-misc/lirc/files/lirc.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Linux Infrared Remote Control
+After=network.target
+
+[Service]
+RuntimeDirectory=lirc
+ExecStart=/usr/sbin/lircd --nodaemon --driver=default --device=/dev/lirc0
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/app-misc/lirc/files/lircd-0.8.6-r2 b/app-misc/lirc/files/lircd-0.8.6-r2
new file mode 100644
index 000000000000..757d4e689e18
--- /dev/null
+++ b/app-misc/lirc/files/lircd-0.8.6-r2
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/lirc/${SVCNAME}.pid
+: ${LIRCD_SYMLINKFILE:=/dev/lircd}
+: ${LIRCD_SOCKET:=/var/run/lirc/lircd}
+
+depend() {
+ need localmount
+ use modules
+ provide lirc
+}
+
+start() {
+ local retval
+
+ ebegin "Starting lircd"
+
+ for retval in ${LIRCD_SET_SYSCLASSRCS} ; do
+ if [ -e /sys/class/rc/${retval}/protocols ] && \
+ grep -qs 'lirc' /sys/class/rc/${retval}/protocols ; then
+ einfo "Setting lirc protocol active for ${retval}"
+ echo lirc >/sys/class/rc/${retval}/protocols
+ fi
+ done
+
+ checkpath -q -d -m 0755 -o root:root /var/run/lirc
+ rm -Rf ${LIRCD_SOCKET} && ln -s ${LIRCD_SOCKET} ${LIRCD_SYMLINKFILE}
+ if [ $? -ne 0 ]; then
+ eend $? "Unable to create symbolic link ${LIRCD_SYMLINKFILE}"
+ return 1
+ fi
+
+ start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd -- \
+ -P "${PIDFILE}" ${LIRCD_OPTS}
+ retval=$?
+
+ if [ ${retval} -ne 0 ]; then
+ rm -Rf ${LIRCD_SOCKET}
+ fi
+
+ eend ${retval}
+}
+
+stop() {
+ ebegin "Stopping lircd"
+ rm -f ${LIRCD_SYMLINKFILE}
+ start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd
+ eend $?
+}
diff --git a/app-misc/lirc/files/lircd.conf.4 b/app-misc/lirc/files/lircd.conf.4
new file mode 100644
index 000000000000..f59c5f214283
--- /dev/null
+++ b/app-misc/lirc/files/lircd.conf.4
@@ -0,0 +1,22 @@
+# Options to pass to the lircd process
+
+# for devices with lirc-kernel-module
+#LIRCD_OPTS="-d /dev/lirc0"
+#LIRCD_OPTS="-d /dev/lirc"
+
+# for devices using the input-layer
+#LIRCD_OPTS="-H devinput -d /dev/input/by-path/pci-0000:00:0a.0--event-ir"
+# This should work, Bug #235107
+#LIRCD_OPTS="-H devinput -d name=*DVB*"
+
+# set default protocol to 'lirc' for in-kernel IR decoding
+# for the following entries in /sys/class/rc/
+# (space-separated list if there is more than one)
+LIRCD_SET_SYSCLASSRCS="rc0"
+
+# If running mulitple instances of lircd, the following
+# can be used to override the default socket path and
+# socket symlink
+#LIRCD_SOCKET="/var/run/lirc/lircd"
+#LIRCD_SYMLINKFILE="/dev/lircd"
+
diff --git a/app-misc/lirc/files/lircm.service b/app-misc/lirc/files/lircm.service
new file mode 100644
index 000000000000..cfd2c93caf6a
--- /dev/null
+++ b/app-misc/lirc/files/lircm.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Mouse
+Requires=lirc.service
+After=network.target lirc.service
+
+[Service]
+ExecStart=/usr/sbin/lircmd --nodaemon
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/app-misc/lirc/files/lircmd b/app-misc/lirc/files/lircmd
new file mode 100644
index 000000000000..e979f74413fc
--- /dev/null
+++ b/app-misc/lirc/files/lircmd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need lircd
+}
+
+start() {
+ ebegin "Starting lircmd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lircmd"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
+ eend $?
+}
diff --git a/app-misc/lirc/files/lircmd-0.10.0.conf b/app-misc/lirc/files/lircmd-0.10.0.conf
new file mode 100644
index 000000000000..4ba169de582d
--- /dev/null
+++ b/app-misc/lirc/files/lircmd-0.10.0.conf
@@ -0,0 +1,4 @@
+# Options to pass to the lircmd process
+
+LIRCMD_OPTS=""
+
diff --git a/app-misc/lirc/files/lircmd-0.9.4a-r2 b/app-misc/lirc/files/lircmd-0.9.4a-r2
new file mode 100644
index 000000000000..a287dc75c636
--- /dev/null
+++ b/app-misc/lirc/files/lircmd-0.9.4a-r2
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need lircd
+}
+
+start() {
+ ebegin "Starting lircmd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/lircmd -- ${LIRCMD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lircmd"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
+ eend $?
+}
diff --git a/app-misc/lirc/files/modprobed.lirc b/app-misc/lirc/files/modprobed.lirc
new file mode 100644
index 000000000000..2ed95589b66d
--- /dev/null
+++ b/app-misc/lirc/files/modprobed.lirc
@@ -0,0 +1,22 @@
+#
+# For first serial receivers:
+#
+#options lirc_serial irq=4 io=0x3f8
+#options lirc_sir irq=4 io=0x3f8
+
+#
+# Detach first serial port from serial-driver.
+# Use this when you have your serial-port-driver statically
+# compiled into your kernel, or as a module but loaded before
+# the lirc-module.
+#
+#install lirc_serial setserial /dev/ttyS0 uart none; modprobe --ignore-install lirc_serial
+#
+#install lirc_sir setserial /dev/ttyS0 uart none; modprobe --ignore-install lirc_sir
+
+
+#
+# For parallel receivers:
+#
+#options lirc_parallel irq=7 io=0x3bc
+
diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild
new file mode 100644
index 000000000000..9b8d2c10c013
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_{5,6} )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+ SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+ SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ audio? (
+ >media-libs/portaudio-18
+ media-libs/alsa-lib
+ )
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ftdi? ( dev-embedded/libftdi:0 )
+ systemd? ( sys-apps/systemd )
+ usb? ( virtual/libusb:0 )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/libxslt
+ doc? ( app-doc/doxygen )
+ sys-apps/kmod
+ sys-kernel/linux-headers
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ gtk? (
+ x11-libs/vte[introspection]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ )
+ inputlirc? ( app-misc/inputlircd )
+"
+
+pkg_setup() {
+ use uinput && CONFIG_CHECK="INPUT_UINPUT"
+}
+
+src_configure() {
+ xdg_environment_reset
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ $(use_enable static-libs static) \
+ $(use_enable devinput) \
+ $(use_enable uinput) \
+ $(use_with X x)
+}
+
+src_install() {
+ default
+
+ if use !gtk ; then
+ # lirc-setup requires gtk
+ rm "${ED%/}"/usr/bin/lirc-setup || die
+ fi
+
+ newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+ newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+ newconfd "${FILESDIR}"/lircd.conf.4 lircd
+ newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+ insinto /etc/modprobe.d/
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+ newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+ newconfd "${FILESDIR}"/irexec-confd irexec
+
+ keepdir /etc/lirc
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+
+ # Avoid QA notice
+ rm -d "${ED%/}"/var/run/lirc || die
+ rm -d "${ED%/}"/var/run || die
+}
+
+pkg_preinst() {
+ local dir="${EROOT%/}/etc/modprobe.d"
+ if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+ elog "Renaming ${dir}/lirc to lirc.conf"
+ mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+ fi
+
+ # copy the first file that can be found
+ if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
+ cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
+ cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+ MOVE_OLD_LIRCD_CONF=1
+ elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ fi
+
+ # stop portage from touching the config file
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+ fi
+}
+
+pkg_postinst() {
+ # copy config file to new location
+ # without portage knowing about it
+ # so it will not delete it on unmerge or ever touch it again
+ if [[ -e "${T}"/lircd.conf ]]; then
+ cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+ rm -f "${EROOT%/}"/etc/lircd.conf || die
+ fi
+ fi
+
+ einfo "The new default location for lircd.conf is inside of"
+ einfo "${EROOT%/}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
new file mode 100644
index 000000000000..9b8d2c10c013
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_{5,6} )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+ SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+ SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ audio? (
+ >media-libs/portaudio-18
+ media-libs/alsa-lib
+ )
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ftdi? ( dev-embedded/libftdi:0 )
+ systemd? ( sys-apps/systemd )
+ usb? ( virtual/libusb:0 )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/libxslt
+ doc? ( app-doc/doxygen )
+ sys-apps/kmod
+ sys-kernel/linux-headers
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ gtk? (
+ x11-libs/vte[introspection]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ )
+ inputlirc? ( app-misc/inputlircd )
+"
+
+pkg_setup() {
+ use uinput && CONFIG_CHECK="INPUT_UINPUT"
+}
+
+src_configure() {
+ xdg_environment_reset
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ $(use_enable static-libs static) \
+ $(use_enable devinput) \
+ $(use_enable uinput) \
+ $(use_with X x)
+}
+
+src_install() {
+ default
+
+ if use !gtk ; then
+ # lirc-setup requires gtk
+ rm "${ED%/}"/usr/bin/lirc-setup || die
+ fi
+
+ newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+ newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+ newconfd "${FILESDIR}"/lircd.conf.4 lircd
+ newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+ insinto /etc/modprobe.d/
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+ newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+ newconfd "${FILESDIR}"/irexec-confd irexec
+
+ keepdir /etc/lirc
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+
+ # Avoid QA notice
+ rm -d "${ED%/}"/var/run/lirc || die
+ rm -d "${ED%/}"/var/run || die
+}
+
+pkg_preinst() {
+ local dir="${EROOT%/}/etc/modprobe.d"
+ if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+ elog "Renaming ${dir}/lirc to lirc.conf"
+ mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+ fi
+
+ # copy the first file that can be found
+ if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
+ cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
+ cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+ MOVE_OLD_LIRCD_CONF=1
+ elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ fi
+
+ # stop portage from touching the config file
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+ fi
+}
+
+pkg_postinst() {
+ # copy config file to new location
+ # without portage knowing about it
+ # so it will not delete it on unmerge or ever touch it again
+ if [[ -e "${T}"/lircd.conf ]]; then
+ cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+ rm -f "${EROOT%/}"/etc/lircd.conf || die
+ fi
+ fi
+
+ einfo "The new default location for lircd.conf is inside of"
+ einfo "${EROOT%/}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.9.0-r6.ebuild b/app-misc/lirc/lirc-0.9.0-r6.ebuild
new file mode 100644
index 000000000000..8672858485e8
--- /dev/null
+++ b/app-misc/lirc/lirc-0.9.0-r6.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils linux-mod linux-info systemd toolchain-funcs flag-o-matic autotools
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+MY_P=${PN}-${PV/_/}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+ SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+ SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="debug doc hardware-carrier transmitter static-libs X"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+ X? (
+ x11-libs/libX11
+ x11-libs/libSM
+ x11-libs/libICE
+ )
+ lirc_devices_alsa_usb? ( media-libs/alsa-lib )
+ lirc_devices_audio? ( >media-libs/portaudio-18 )
+ lirc_devices_irman? ( media-libs/libirman )"
+
+# 2012-07-17, Ian Stakenvicius
+# A helper script that scrapes out values for nearly all of the variables below
+# from lirc's configure.ac is available at
+# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
+
+# This are drivers with names matching the
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_DIRECT="
+ all userspace accent act200l act220l
+ adaptec alsa_usb animax asusdh atilibusb
+ atiusb audio audio_alsa avermedia avermedia_vdomate
+ avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
+ bte bw6130 caraca chronos commandir
+ cph06x creative creative_infracd
+ devinput digimatrix dsp dvico ea65 ene0100
+ exaudio flyvideo ftdi gvbctv5pci hauppauge
+ hauppauge_dvb hercules_smarttv_stereo i2cuser
+ igorplugusb iguanaIR imon imon_24g imon_knob
+ imon_lcd imon_pad imon_rsc irdeo irdeo_remote
+ irlink irman irreal it87 ite8709
+ knc_one kworld leadtek_0007 leadtek_0010
+ leadtek_pvr2000 livedrive_midi
+ livedrive_seq logitech macmini
+ mediafocusI mouseremote
+ mouseremote_ps2 mp3anywhere mplay nslu2
+ packard_bell parallel pcmak pcmak_usb
+ pctv pixelview_bt878 pixelview_pak
+ pixelview_pro provideo realmagic
+ remotemaster sa1100 samsung sasem sb0540 serial
+ silitek sir slinke streamzap tekram
+ tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
+ uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
+
+# drivers that need special handling and
+# must have another name specified for
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_SPECIAL="
+ serial_igor_cesko
+ remote_wonder_plus xboxusb inputlirc"
+
+IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
+
+# The following are lists which are used to provide ewarns on incompatibilities
+# with the kernel:
+
+#drivers that do not build kernel modules
+NO_KMOD_BUILT_FOR_DEV="
+ accent bte creative creative_infracd devinput dsp ea65 exaudio
+ ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
+ mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
+ pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
+ tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
+
+#drivers that build lirc_dev and so will conflict with kernel lirc_dev
+LIRCDEV_BUILT_FOR_DEV="all
+ act200l act220l adaptec animax atiusb breakoutbox hauppauge
+ hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
+ imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
+ leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
+ provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
+ tvbox wpc8769l zotac"
+
+#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
+LIRC_GPIO_DEV="
+ avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
+ cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
+ pixelview_pak pixelview_pro"
+
+#device-driver which use libusb
+LIBUSB_USED_BY_DEV="
+ all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
+ imon_rsc streamzap xboxusb irlink commandir"
+
+for dev in ${LIBUSB_USED_BY_DEV}; do
+ DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
+done
+
+# adding only compile-time depends
+DEPEND="${RDEPEND} ${DEPEND}
+ virtual/linux-sources
+ lirc_devices_ftdi? ( dev-embedded/libftdi:0 )
+ lirc_devices_all? ( dev-embedded/libftdi:0 )"
+
+# adding only run-time depends
+RDEPEND="${RDEPEND}
+ lirc_devices_inputlirc? ( app-misc/inputlircd )
+ lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
+
+# add all devices to IUSE
+# and ensure lirc_devices_all is not set alongside lirc_devices_*
+REQUIRED_USE="lirc_devices_all? ("
+for dev in ${IUSE_LIRC_DEVICES}; do
+ IUSE="${IUSE} lirc_devices_${dev}"
+ if [[ "${dev}" != "all" ]]; then
+ REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
+ fi
+done
+REQUIRED_USE="${REQUIRED_USE} )"
+
+add_device() {
+ local dev="${1}"
+ local desc="device ${dev}"
+ if [[ -n "${2}" ]]; then
+ desc="${2}"
+ fi
+
+ # Bug #187418
+ if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
+ eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
+ eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
+ return 0
+ fi
+ : ${lirc_device_count:=0}
+ ((lirc_device_count++))
+
+ elog "Compiling support for ${desc}"
+
+ if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
+ if linux_chkconfig_present LIRC ; then
+ ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
+ fi
+ if ! linux_chkconfig_present MODULE_UNLOAD ; then
+ ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
+ ewarn "You will need MODULE_UNLOAD support in your kernel."
+ fi
+ fi
+ if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
+ ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
+ fi
+
+ if [[ ${lirc_device_count} -eq 2 ]] ; then
+ ewarn
+ ewarn "LIRC_DEVICES has more than one entry."
+ ewarn "When selecting multiple devices for lirc to be supported,"
+ ewarn "it can not be guaranteed that the drivers play nice together."
+ ewarn "If this is not intended, then please adjust LIRC_DEVICES"
+ ewarn "and re-emerge."
+ ewarn
+ fi
+
+ MY_OPTS="${MY_OPTS} --with-driver=${dev}"
+}
+
+pkg_pretend() {
+ if [[ -n "${LIRC_OPTS}" ]] ; then
+ ewarn
+ ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
+ ewarn
+ ewarn "Please use LIRC_DEVICES from now on."
+ ewarn "e.g. LIRC_DEVICES=\"serial sir\""
+ ewarn
+ ewarn "Flags are now set per use-flags."
+ ewarn "e.g. transmitter, hardware-carrier"
+
+ local opt
+ local unsupported_opts=""
+
+ # test for allowed options for LIRC_OPTS
+ for opt in ${LIRC_OPTS}; do
+ case ${opt} in
+ --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
+ MY_OPTS="${MY_OPTS} ${opt}"
+ ;;
+ *)
+ unsupported_opts="${unsupported_opts} ${opt}"
+ ;;
+ esac
+ done
+ if [[ -n ${unsupported_opts} ]]; then
+ eerror "These options are no longer allowed to be set"
+ eerror "with LIRC_OPTS: ${unsupported_opts}"
+ die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
+ fi
+ fi
+}
+
+pkg_setup() {
+ linux-mod_pkg_setup
+
+ # set default configure options
+ MY_OPTS=""
+ LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+ if use lirc_devices_all; then
+ # compile in drivers for a lot of devices
+ add_device all "a lot of devices"
+ else
+ # compile in only requested drivers
+ local dev
+ for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
+ if use lirc_devices_${dev}; then
+ add_device ${dev}
+ fi
+ done
+
+ if use lirc_devices_remote_wonder_plus; then
+ add_device atiusb "device Remote Wonder Plus (atiusb-based)"
+ fi
+
+ if use lirc_devices_serial_igor_cesko; then
+ add_device serial "serial with Igor Cesko design"
+ MY_OPTS="${MY_OPTS} --with-igor"
+ fi
+
+ if use lirc_devices_imon_pad; then
+ ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
+ ewarn "and removed the pad2keys_active option for the lirc_imon module"
+ ewarn "because it is always active."
+ ewarn "If you have an older imon VFD device, you may need to add the module"
+ ewarn "option display_type=1 to override autodetection and force VFD mode."
+ fi
+
+ if use lirc_devices_xboxusb; then
+ add_device atiusb "device xboxusb"
+ fi
+
+ if [[ "${MY_OPTS}" == "" ]]; then
+ if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
+ # on xbox: use special driver
+ add_device atiusb "device xboxusb"
+ else
+ # no driver requested
+ elog
+ elog "Compiling only the lirc-applications, but no drivers."
+ elog "Enable drivers with LIRC_DEVICES if you need them."
+ MY_OPTS="--with-driver=none"
+ fi
+ fi
+ fi
+
+ use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
+ use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
+
+ einfo
+ einfo "lirc-configure-opts: ${MY_OPTS}"
+ elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
+
+ filter-flags -Wl,-O1
+}
+
+src_prepare() {
+ # Rip out dos CRLF
+ edos2unix contrib/lirc.rules
+
+ # Apply patches needed for some special device-types
+ use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
+ use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
+
+ # Apply fixes for kernel-2.6.39 and above
+ epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
+ # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
+ # for bug 377033
+ epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
+ # Apply fixes for kernel-3.3 and above (bug 439538)
+ epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
+ # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
+ epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
+ # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
+ epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
+ # Add support for zotac remote, bug 342848
+ epatch "${FILESDIR}"/${P}-add-zotac-support.patch
+ # Use fixed font
+ epatch "${FILESDIR}"/${P}-fixed-font.patch
+
+ # Do not build drivers from the top-level Makefile
+ sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
+
+ # remove parallel driver on SMP systems
+ if linux_chkconfig_present SMP ; then
+ sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
+ fi
+
+ # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
+ if use lirc_devices_all && kernel_is ge 2 6 22 ; then
+ ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
+ sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
+ fi
+
+ # respect CFLAGS
+ sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
+
+ # setting default device-node
+ local f
+ for f in configure.ac acconfig.h; do
+ [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
+ done
+ echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
+
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ --with-syslog=LOG_DAEMON \
+ --enable-sandboxed \
+ --with-kerneldir="${KV_DIR}" \
+ --with-moduledir="/lib/modules/${KV_FULL}/misc" \
+ $(use_enable debug) \
+ $(use_enable static-libs static) \
+ $(use_with X x) \
+ ${MY_OPTS} \
+ ABI="${KERNEL_ABI}" \
+ ARCH="$(tc-arch-kernel)"
+}
+
+src_compile() {
+ # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
+ emake -j1
+
+ MODULE_NAMES="lirc(misc:${S}/drivers)"
+ BUILD_TARGETS="all"
+ linux-mod_src_compile
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake -C drivers DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+ newinitd "${FILESDIR}"/lircmd lircmd
+ newconfd "${FILESDIR}"/lircd.conf.4 lircd
+
+ insinto /etc/modprobe.d/
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+ newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
+ newconfd "${FILESDIR}"/irexec-confd irexec
+
+ systemd_dounit "${FILESDIR}"/irexec.service
+ systemd_dounit "${FILESDIR}"/lirc.service
+ systemd_dounit "${FILESDIR}"/lircm.service
+
+ if use doc ; then
+ dohtml doc/html/*.html
+ insinto /usr/share/doc/${PF}/images
+ doins doc/images/*
+ fi
+
+ insinto /usr/share/lirc/remotes
+ doins -r remotes/*
+
+ keepdir /etc/lirc
+ if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
+ newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
+ fi
+
+ use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
+}
+
+pkg_preinst() {
+ linux-mod_pkg_preinst
+
+ local dir="${EROOT}/etc/modprobe.d"
+ if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+ elog "Renaming ${dir}/lirc to lirc.conf"
+ mv -f "${dir}/lirc" "${dir}/lirc.conf"
+ fi
+
+ # copy the first file that can be found
+ if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+ cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
+ elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+ cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
+ MOVE_OLD_LIRCD_CONF=1
+ elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
+ cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
+ fi
+
+ # stop portage from touching the config file
+ if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
+ rm -f "${D}"/etc/lirc/lircd.conf
+ fi
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ # copy config file to new location
+ # without portage knowing about it
+ # so it will not delete it on unmerge or ever touch it again
+ if [[ -e "${T}"/lircd.conf ]]; then
+ cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+ rm -f "${EROOT}"/etc/lircd.conf
+ fi
+ fi
+
+ einfo "The new default location for lircd.conf is inside of"
+ einfo "/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
new file mode 100644
index 000000000000..3a8d3814118e
--- /dev/null
+++ b/app-misc/lirc/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <use>
+ <flag name="uinput">Enable support for uinput</flag>
+ <flag name="devinput">Support the devinput input device</flag>
+ <flag name="hardware-carrier">The transmitter device generates its clock signal in hardware</flag>
+ <flag name="transmitter">Add transmitter support to some lirc-drivers (e.g. serial)</flag>
+ <flag name="inputlirc">Add a dependency on app-misc/inputlircd</flag>
+ <flag name="audio">Support using an audio device connected to an IR receiver</flag>
+ <flag name="ftdi">Support FTDI devices</flag>
+ <flag name="gtk">Include GTK support which enables the use of lirc-setup</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">lirc</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ LIRC (Linux Infrared remote control) allows users to receive and send infrared signals.
+ </longdescription>
+</pkgmetadata>
+
diff --git a/app-misc/livecd-tools-2.2 b/app-misc/livecd-tools-2.2
deleted file mode 100644
index 8d1555c336d1..000000000000
--- a/app-misc/livecd-tools-2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
-EAPI=6
-HOMEPAGE=http://wolf31o2.org/projects/livecd-tools
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~williamh/dist/livecd-tools-2.2.tar.gz
-_md5_=5c52be71800cce5608e63cb911f55144
diff --git a/app-misc/livecd-tools-2.3 b/app-misc/livecd-tools-2.3
deleted file mode 100644
index aad0a61dd910..000000000000
--- a/app-misc/livecd-tools-2.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.3.tar.bz2
-_md5_=7a1bb5f6e1f5abe0db976fdf11551362
diff --git a/app-misc/livecd-tools-2.4 b/app-misc/livecd-tools-2.4
deleted file mode 100644
index 10ec916a0544..000000000000
--- a/app-misc/livecd-tools-2.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.4.tar.bz2
-_md5_=aa44c6761beaaade58e162cf37503677
diff --git a/app-misc/livecd-tools-9999 b/app-misc/livecd-tools-9999
deleted file mode 100644
index 3ab9deafdd26..000000000000
--- a/app-misc/livecd-tools-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 dev-util/dialog net-dialup/mingetty sys-apps/gawk sys-apps/pciutils sys-apps/sed
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85e97843bb3ed0e669753f0be8632484
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
new file mode 100644
index 000000000000..b1fa9e0cd8df
--- /dev/null
+++ b/app-misc/livecd-tools/Manifest
@@ -0,0 +1,8 @@
+DIST livecd-tools-2.2.tar.gz 11419 BLAKE2B 4dca047acd82bb8fa14bb117b42141c2b4a0cd441b965a677c33932c77166c2e89af2d396bc2f1e699174ad0f911e54c16431d93dfe7f8796ce66859e8e69fc3 SHA512 62891c132b0f392b775116d90740ea30a546a75736b17d10e5915ededa72ed730934555cab9a0b81a6def49e687c13db3e92e1e4f325854151569ad3e814bec0
+DIST livecd-tools-2.3.tar.bz2 11128 BLAKE2B f89c02fac4ec60b36a1e11c547d52290c80e028e1b07d25533846bba8b8b861faa7b1d85ebffd4936593b5f975851b680e73e6502c23d62c68c03646d1373dbc SHA512 93a5742a4cc243fee07088f5957c1eb48c2276460c391c089502eccba5bfe80b52fa7a7d058502b18086130bd8686c8c0e4af8f3f03f72c98b482776e0f225a9
+DIST livecd-tools-2.4.tar.bz2 11506 BLAKE2B 0e7fc54ab4185ba725f2672dbd15a87e7cef249224e51895e2cedb1e163d8fc25566f989eb8fa118111d0d50bed2b6c7e303586b322b1e9b41bf746778a056f0 SHA512 52c2ecf583bca68ee5d3dfce9973268758753069a3255dd3d435b9240feb8c99d7c7595c0c009ddc89566d79c01552eab7dbc8a9055d4841104dfe4e224d832b
+EBUILD livecd-tools-2.2.ebuild 968 BLAKE2B d405700c03c96d8188c4c859b0eb074ff80a6acf68454c4b9e42ad1e04af8d509565ba83548408f6490edeca55cbb4713f021b3a1b08c33f530fe5dc7eecfc3f SHA512 7aac852fb8a30b438d77776a308942f73f9415602c2d9cf38c063b23fdf1765e26e53b99266c049150533db20e67dfa1168c803597c612f816be962d53991329
+EBUILD livecd-tools-2.3.ebuild 969 BLAKE2B bb26696ff9a37f11bf52c394f5aa05d7bf024f287fef9d1c12e7f795699a1101ba26e478ef996cb761f9a81d089114c0959bcc9a496bfc196c5f9bcc80a85896 SHA512 79d62b217c1699a022f7b3076e1d8537c9d3cded37a8cd995cb4a1d5efda129cf12e36d0a934e90fe139d470a1eaadf929e5addbcdcf84797c0569b7a3a56d16
+EBUILD livecd-tools-2.4.ebuild 969 BLAKE2B 6d9e46f8b4767c19d1305c1a54b50e31268ca9f80e3947423d1bbcef7eb8d823de7490c1c6e81fbef6680c4b21b371dda9481d94c34529b30deb951d04318baa SHA512 65cb9f341e8e3a018183918ca746946f43a2d710117c13530ada1e555ba1ecaf37b19315bcde6051aab1305fd532eb57bc67e8c1b3ec250ca2da080e9d0d68a4
+EBUILD livecd-tools-9999.ebuild 968 BLAKE2B 6720c8fceda58a958761af9730dcb671e7fced6f59aa1a46205ae9842b7fb6af3d23dc6fb758c99fd503bad4d2d32bb0ece131b531b6ef938f8dc1c73f71179e SHA512 46c70eb5076b1053ca7ffeb7f765c7bb9b4b691a856d556d12d3bb85be95e083db5e88943482fa060d9b113c757417e4d27b0511ce6b6f172fd589db5b2b0dad
+MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/app-misc/livecd-tools/livecd-tools-2.2.ebuild b/app-misc/livecd-tools/livecd-tools-2.2.ebuild
new file mode 100644
index 000000000000..5a008a9df98b
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
+ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+fi
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="http://wolf31o2.org/projects/livecd-tools"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="dev-util/dialog
+ net-dialup/mingetty
+ >=sys-apps/baselayout-2
+ >=sys-apps/openrc-0.8.2-r1
+ sys-apps/pciutils
+ sys-apps/gawk
+ sys-apps/sed"
+
+pkg_setup() {
+ ewarn "This package is designed for use on the LiveCD only and will do"
+ ewarn "unspeakably horrible and unexpected things on a normal system."
+ ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_install() {
+ doconfd conf.d/*
+ doinitd init.d/*
+ dosbin net-setup
+ into /
+ dosbin livecd-functions.sh
+}
diff --git a/app-misc/livecd-tools/livecd-tools-2.3.ebuild b/app-misc/livecd-tools/livecd-tools-2.3.ebuild
new file mode 100644
index 000000000000..b60b6111ad7b
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+ inherit git-r3
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+fi
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="https://www.gentoo.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="dev-util/dialog
+ net-dialup/mingetty
+ >=sys-apps/baselayout-2
+ >=sys-apps/openrc-0.8.2-r1
+ sys-apps/pciutils
+ sys-apps/gawk
+ sys-apps/sed"
+
+pkg_setup() {
+ ewarn "This package is designed for use on the LiveCD only and will do"
+ ewarn "unspeakably horrible and unexpected things on a normal system."
+ ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_install() {
+ doconfd conf.d/*
+ doinitd init.d/*
+ dosbin net-setup
+ into /
+ dosbin livecd-functions.sh
+}
diff --git a/app-misc/livecd-tools/livecd-tools-2.4.ebuild b/app-misc/livecd-tools/livecd-tools-2.4.ebuild
new file mode 100644
index 000000000000..6304b890ff88
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+ inherit git-r3
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+fi
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="https://www.gentoo.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="dev-util/dialog
+ net-dialup/mingetty
+ >=sys-apps/baselayout-2
+ >=sys-apps/openrc-0.8.2-r1
+ sys-apps/pciutils
+ sys-apps/gawk
+ sys-apps/sed"
+
+pkg_setup() {
+ ewarn "This package is designed for use on the LiveCD only and will do"
+ ewarn "unspeakably horrible and unexpected things on a normal system."
+ ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_install() {
+ doconfd conf.d/*
+ doinitd init.d/*
+ dosbin net-setup
+ into /
+ dosbin livecd-functions.sh
+}
diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
new file mode 100644
index 000000000000..99000ce942c3
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit eutils
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="https://www.gentoo.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="
+ >=sys-apps/baselayout-2
+ >=sys-apps/openrc-0.8.2-r1
+ dev-util/dialog
+ net-dialup/mingetty
+ sys-apps/gawk
+ sys-apps/pciutils
+ sys-apps/sed
+"
+
+pkg_setup() {
+ ewarn "This package is designed for use on the LiveCD only and will do"
+ ewarn "unspeakably horrible and unexpected things on a normal system."
+ ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_install() {
+ doconfd conf.d/*
+ doinitd init.d/*
+ dosbin net-setup
+ into /
+ dosbin livecd-functions.sh
+}
diff --git a/app-misc/livecd-tools/metadata.xml b/app-misc/livecd-tools/metadata.xml
new file mode 100644
index 000000000000..767266dca141
--- /dev/null
+++ b/app-misc/livecd-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/lockfile-progs-0.1.17 b/app-misc/lockfile-progs-0.1.17
deleted file mode 100644
index 72b9ff69ac29..000000000000
--- a/app-misc/lockfile-progs-0.1.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/liblockfile
-DESCRIPTION=Programs to safely lock/unlock files and mailboxes
-EAPI=5
-HOMEPAGE=https://packages.debian.org/sid/lockfile-progs
-KEYWORDS=amd64 arm ~mips ppc ~s390 ~sh sparc x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/liblockfile
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_0.1.17.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=73ba22095948f168c817baac148a048c
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
new file mode 100644
index 000000000000..b1a96cf82571
--- /dev/null
+++ b/app-misc/lockfile-progs/Manifest
@@ -0,0 +1,4 @@
+AUX Makefile 1906 BLAKE2B 9c294471555a7dbe6d4342e8af7c744731c05ab22adc2192eb94da5e166c5a94705e328ca600055e722d8610869d20246fab741ef494f6e68d987c913e8054cb SHA512 c3ebd2f737fc664b37e235a0a68f50ebe80f00dbc522566520edb9827771344d022531c50283be5eaddd26d72295faae2676ef58838dd65797c74059719d826d
+DIST lockfile-progs_0.1.17.tar.gz 14833 BLAKE2B 3e67aee40a8700c330eb8dd1f9ae3973d50f733333825a3e176434586357e9bbb3db9d480f6a778d383c5dbaca03d3cde90291c7668e3b9bc425b93a0b53fa2b SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596
+EBUILD lockfile-progs-0.1.17.ebuild 760 BLAKE2B 1369da0fa34669b7c4398c7cc7e0f861aea9809a340778bf43bebc92242ca524f15d0f39746b53fecbdd37a514f51375cc89c963687257a549ac9327cf8f8cea SHA512 3d1c74cf0fcd9727d8f527cde863c93f98b9c8c3d63209ef12edb0fc5991f2367cab26074b320c8e94ee6574592fff2a043fe5a2d461deb13bedeef0670ac63d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/lockfile-progs/files/Makefile b/app-misc/lockfile-progs/files/Makefile
new file mode 100644
index 000000000000..27276b30f5da
--- /dev/null
+++ b/app-misc/lockfile-progs/files/Makefile
@@ -0,0 +1,55 @@
+all: lockfile-create
+
+lockfile-create: lockfile-progs.o
+ ${CC} -o $@ ${CFLAGS} ${LDFLAGS} $^ -llockfile
+
+install: all
+ install -d $(DESTDIR)/usr/bin
+
+ install --mode=755 lockfile-create $(DESTDIR)/usr/bin/lockfile-create
+ ln -s lockfile-create $(DESTDIR)/usr/bin/lockfile-remove
+ ln -s lockfile-create $(DESTDIR)/usr/bin/lockfile-touch
+ ln -s lockfile-create $(DESTDIR)/usr/bin/lockfile-check
+
+ install --mode=755 lockfile-create $(DESTDIR)/usr/bin/mail-lock
+ ln -s mail-lock $(DESTDIR)/usr/bin/mail-unlock
+ ln -s mail-unlock $(DESTDIR)/usr/bin/mail-touchlock
+
+ install -d $(DESTDIR)/usr/share/man/man1
+
+ install --mode=644 lockfile-progs.1 $(DESTDIR)/usr/share/man/man1
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-create.1
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-remove.1
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-touch.1
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-check.1
+
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/mail-lock.1
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/mail-unlock.1
+ ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/mail-touchlock.1
+
+test: all
+ ln -s lockfile-create ./lockfile-remove
+ ln -s lockfile-create ./lockfile-touch
+ ln -s lockfile-create ./lockfile-check
+
+ ./lockfile-create testfile
+ ./lockfile-check testfile
+ ./lockfile-touch --oneshot testfile
+ ./lockfile-check testfile
+ ./lockfile-remove testfile
+ ! test -e testfile
+ ! ./lockfile-check testfile
+
+ ./lockfile-create --lock-name test.lock
+ ./lockfile-check --lock-name test.lock
+ ! ./lockfile-check test.lock
+ ! test -e test.lock.lock
+ ./lockfile-touch --oneshot --lock-name test.lock
+ ./lockfile-check --lock-name test.lock
+ ! ./lockfile-check test.lock
+ ./lockfile-remove --lock-name test.lock
+ ! test -e test.lock
+ ! ./lockfile-check --lock-name test.lock
+ ! ./lockfile-check test.lock
+
+.PHONY: install test
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
new file mode 100644
index 000000000000..2fb294180f22
--- /dev/null
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
+HOMEPAGE="https://packages.debian.org/sid/lockfile-progs"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="net-libs/liblockfile"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # Provide better Makefile, with clear separation between compilation
+ # and installation.
+ cp "${FILESDIR}/Makefile" . || die
+}
+
+src_compile() {
+ tc-export CC
+ default
+}
+
+src_install() {
+ # Makefile has no notion of PREFIX, bindir, and the like
+ emake DESTDIR="${ED}" install
+}
diff --git a/app-misc/lockfile-progs/metadata.xml b/app-misc/lockfile-progs/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-misc/lockfile-progs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/logitech-applet-0.4_pre1-r3 b/app-misc/logitech-applet-0.4_pre1-r3
deleted file mode 100644
index 80a04cd97cf4..000000000000
--- a/app-misc/logitech-applet-0.4_pre1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/libusb:0
-DESCRIPTION=Control utility for some special features of some special Logitech USB mice!
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0
-SLOT=0
-SRC_URI=mirror://gentoo/logitech_applet-0.4test1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4ae5ba5cebecf114d5bd4995b627e69f
diff --git a/app-misc/logitech-applet/Manifest b/app-misc/logitech-applet/Manifest
new file mode 100644
index 000000000000..3ecf7b1f7da9
--- /dev/null
+++ b/app-misc/logitech-applet/Manifest
@@ -0,0 +1,5 @@
+AUX 40-logitech_applet.rules 251 BLAKE2B f29b2df9ca3427e4bfbe993a9d92ce39df25aefc13d4698418a13530e60f2c57c80ae9f4f2a3baecc1ddd2da2178d5be5f68d354f44fb88a5ce357e05d510c4b SHA512 689058ab61508c342a29dea2de620473453e9237c33cc0119b2c22dc502b6c345d8e42d7769c7cc246c75efbbfa91bd2fdaea15c40ce89468224274b20b80670
+AUX logitech-applet-0.4_pre1-mx300-mx518.patch 5815 BLAKE2B 79c277fd37a439ba3441e0414437004443967c06db6d5615a47da134ddf2daa8b4ffbde43aa3a210e6a76e8125def42fd033fe706ed85a937249db6feb5feb86 SHA512 5b613821ed6c88eed99c36bf1d6df5c27183e41e176082247752970f372aef0e299e729aaeda508ef1cfe323a0e3ce368d3ca1a13a6836278458a531531883ff
+DIST logitech_applet-0.4test1.tar.gz 75783 BLAKE2B 71ac28c1efab922c5d48db00be53eb0c9200ea05972d1fc1a9551f3963fd9d4be46e7a66ebabb873873e1c0e89486e0e32ea7810cafb3eb0ade67cf399c46508 SHA512 64389b365d9d3473bf3ec027c7d9ee34cbdcddf9abb6bfabf4e771a255dade80e6758b7a997da3eaf23c19f1bd4559e79fb199e9f62e0f2ad1af92eab4b23789
+EBUILD logitech-applet-0.4_pre1-r3.ebuild 701 BLAKE2B f24c0721bfd186e56f8432a795d2f9e1789122a36d1b8b85e439a7ee0459f653777974f4ed271b4c0836f80aeae741cd5efa310f779925f7a72fa8921fb544a6 SHA512 1ff40051c70f4b54beb8a396628a00bbe738936f6efb180e3a7228a71c2ecaf8658091e7c93670f7a40623eaedf2d813fa8e2c851a42a485ea9969ea9b484f9a
+MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/app-misc/logitech-applet/files/40-logitech_applet.rules b/app-misc/logitech-applet/files/40-logitech_applet.rules
new file mode 100644
index 000000000000..a51277c3ecb9
--- /dev/null
+++ b/app-misc/logitech-applet/files/40-logitech_applet.rules
@@ -0,0 +1,6 @@
+ACTION!="add", GOTO="logitech_applet_rules_end"
+SUBSYSTEM!="usb*", GOTO="logitech_applet_rules_end"
+
+ATTRS{manufacturer}=="Logitech", ATTRS{product}=="USB-PS/2 Optical Mouse", RUN+="/usr/sbin/logitech_applet -s 800"
+
+LABEL="logitech_applet_rules_end"
diff --git a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
new file mode 100644
index 000000000000..3e2e06536fcd
--- /dev/null
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
@@ -0,0 +1,139 @@
+--- a/logitech_applet.c
++++ b/logitech_applet.c
+@@ -40,6 +40,44 @@
+ #endif
+
+ #define VENDOR_LOGITECH 0x046D
++#define HAS_RES 0x01 /* mouse supports variable resolution */
++#define HAS_SS 0x02 /* mouse supports smart scroll control */
++#define HAS_CSR 0x04 /* mouse supports cordless status reporting and control */
++#define HAS_SSR 0x08 /* mouse supports smart scroll reporting */
++#define USE_CH2 0x10 /* mouse needs to use the second channel */
++
++struct device_table {
++ int idVendor;
++ int idProduct;
++ char* Model;
++ char* Name;
++ int flags;
++}
++
++device_table[] = {
++ { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
++ { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
++ { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
++ { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
++ { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
++ { VENDOR_LOGITECH, 0xC01E, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
++ { VENDOR_LOGITECH, 0xC01F, "M-BS82", "MX300 Optical Mouse", HAS_RES },
++ { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
++ { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
++ { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
++ { VENDOR_LOGITECH, 0xC051, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
++ { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
++ { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
++ { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
++ { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
++ { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
++ { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
++ { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
++ { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
++ { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
++ { 0, 0, 0, 0, 0 }
++};
++
+
+ int get_resolution(struct usb_device *dev)
+ {
+@@ -141,7 +179,12 @@
+ return cruise;
+ }
+
+-/* resolution should be 0x03 for 400cpi, 0x04 for 800cpi */
++/* resolution should be:
++ * - 0x03 for 400cpi
++ * - 0x04 for 800cpi
++ * - 0x05 for 1200cpi
++ * - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
++ */
+ int set_resolution(struct usb_device *dev, int resolution)
+ {
+ usb_dev_handle *usb_h;
+@@ -233,39 +276,6 @@
+ printf("Logitech Mouse Applet, Version %s\n", VERSION);
+ }
+
+-#define HAS_RES 0x01 /* mouse supports variable resolution */
+-#define HAS_SS 0x02 /* mouse supports smart scroll control */
+-#define HAS_CSR 0x04 /* mouse supports cordless status reporting and control */
+-#define HAS_SSR 0x08 /* mouse supports smart scroll reporting */
+-#define USE_CH2 0x10 /* mouse needs to use the second channel */
+-
+-struct device_table {
+- int idVendor;
+- int idProduct;
+- char* Model;
+- char* Name;
+- int flags;
+-} device_table[] = {
+- { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
+- { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
+- { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
+- { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
+- { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
+- { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
+- { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
+- { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
+- { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
+- { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
+- { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
+- { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
+- { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
+- { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
+- { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
+- { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
+- { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
+- { 0, 0, 0, 0, 0 }
+-};
+-
+ int main(int argc, char **argv)
+ {
+ struct usb_bus *bus;
+@@ -318,8 +328,12 @@
+ resolution = 400;
+ else if (!strcmp("800", optarg))
+ resolution = 800;
++ else if (!strcmp("1200", optarg))
++ resolution = 1200;
++ else if (!strcmp("1600", optarg))
++ resolution = 1600;
+ else
+- printf("Bad argument (should be 400 or 800)\n");
++ printf("Bad argument (should be 400, 800, 1200 or 1600)\n");
+ break;
+ case 'v':
+ version();
+@@ -363,14 +377,22 @@
+ break;
+ case 4: printf("800cpi\n");
+ break;
++ case 5: printf("1200cpi\n");
++ break;
++ case 6: printf("1600cpi\n");
++ break;
+ default: printf("(Unexpected result:%i)\n", resolution);
+ break;
+ }
+ } else {
+ if (400 == resolution)
+ set_resolution(dev, 0x03);
+- else
++ else if (800 == resolution)
+ set_resolution(dev, 0x04);
++ else if (1200 == resolution)
++ set_resolution(dev, 0x05);
++ else
++ set_resolution(dev, 0x06);
+ }
+ }
+
diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
new file mode 100644
index 000000000000..54066326d6cc
--- /dev/null
+++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${P/_pre/test}
+MY_P=${MY_P/-applet/_applet}
+
+DESCRIPTION="Control utility for some special features of some special Logitech USB mice!"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-mx300-mx518.patch
+}
+
+src_install() {
+ dosbin logitech_applet
+ dodoc AUTHORS ChangeLog README doc/article.txt
+
+ docinto examples
+ dodoc "${FILESDIR}"/40-logitech_applet.rules
+}
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
new file mode 100644
index 000000000000..49c86a887b6a
--- /dev/null
+++ b/app-misc/logitech-applet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/logserial-0.4.2 b/app-misc/logserial-0.4.2
deleted file mode 100644
index 223579c465e8..000000000000
--- a/app-misc/logserial-0.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A tool for logging raw data from a serial device
-EAPI=6
-HOMEPAGE=http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/logserial-0.4.2.lsm
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/logserial-0.4.2.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ca94372a167c6dd76a8faa7f03438445
diff --git a/app-misc/logserial/Manifest b/app-misc/logserial/Manifest
new file mode 100644
index 000000000000..924945d80319
--- /dev/null
+++ b/app-misc/logserial/Manifest
@@ -0,0 +1,4 @@
+AUX logserial-0.4.2-gentoo.patch 704 BLAKE2B 7591caa786188f9ba051b3e43462c85a096f5d09cad3b7992f03af7329d31e96600d96d450107a6dc3e6ae19cf7a78030e99119a6d4eb3ac6f36c1f1ca2e1008 SHA512 53874fd3d8c1e15af3614f779c1a85c53d43218c13ac508166dfca8c9012d7e251d9fbb3fe22cbcd2167594848ebff5f2e9f48dcad11c153f18abdf2e46233bc
+DIST logserial-0.4.2.tar.gz 9697 BLAKE2B d32b03e50459a65d0072aa961421c6aaef67483d16d6e95b6071fe805f69b79fa1b3a63fb8ce5945fa19f3c912fd6de051549da3edbb2814b7eb4c68c036cc19 SHA512 63784f5f3b84c1fbf85e0b5295ab33c427626562d880de3202b792ad354f93d645d4c2ddb7dc38d48ee25a15df51f1544aa0abea45fccef333553492ed86e9ad
+EBUILD logserial-0.4.2.ebuild 583 BLAKE2B fcd1d9558c8147632dc0f7e86408a52ee57af6b007dbed3f1b7408295e1ccd335a2b366e0db14ed812c4deec952015721e6d5034cdc127e187b378edd51ab2fd SHA512 390d0561a8b6e6177ba66468f850fcde1e4ff63086f5d061674bd8bdad0f94f0d10873d73e361caa6e84daccde05df2944010a2e5272fedeb2fd1ca65b7da737
+MISC metadata.xml 483 BLAKE2B f185b1ee76bdbd2d69171cc52fd98e2859137b5fd4bda92e0917585f589c6ac1e58d97b72c22d2d87d2921c16820367169836dccc5bb44a0259e2d73f34b5860 SHA512 8c7789cc64787fd8a2590921ef0adcf4720d96d211b0308bcfe97e32014d0aa36ae9c2b7bee8cef042617c421787ff4a837ee7b1e1dda789bae4823dfe7d2e8f
diff --git a/app-misc/logserial/files/logserial-0.4.2-gentoo.patch b/app-misc/logserial/files/logserial-0.4.2-gentoo.patch
new file mode 100644
index 000000000000..dd594e34f76a
--- /dev/null
+++ b/app-misc/logserial/files/logserial-0.4.2-gentoo.patch
@@ -0,0 +1,30 @@
+diff -ur logserial-0.4.2.orig/Makefile logserial-0.4.2/Makefile
+--- logserial-0.4.2.orig/Makefile 2003-04-12 19:41:07.000000000 +0300
++++ logserial-0.4.2/Makefile 2009-07-21 19:39:18.000000000 +0300
+@@ -5,22 +5,20 @@
+ # FUNCTION:
+ # Makefile for logserial
+
+-CC=gcc
++CC ?= gcc
+
+ NAME=logserial
+ VERSION=0.4.2
+
+ OBJS= logserial.o sysdep1.o
+
+-OPTIMIZE= -O3 -m486 -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
+-DEBUG_FLAGS= #-g
+-
+-CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
++CFLAGS += -Wall
++CPPFLAGS += -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
+
+ all: $(NAME)
+
+ $(NAME): $(OBJS)
+- $(CC) $(CFLAGS) -o $(NAME) $(OBJS)
++ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJS)
+
+ $(NAME).o: $(NAME).c
+
diff --git a/app-misc/logserial/logserial-0.4.2.ebuild b/app-misc/logserial/logserial-0.4.2.ebuild
new file mode 100644
index 000000000000..62f267f92996
--- /dev/null
+++ b/app-misc/logserial/logserial-0.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for logging raw data from a serial device"
+HOMEPAGE="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/logserial-0.4.2.lsm"
+SRC_URI="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin logserial
+ dodoc CHANGELOG README
+}
diff --git a/app-misc/logserial/metadata.xml b/app-misc/logserial/metadata.xml
new file mode 100644
index 000000000000..46956d7db72d
--- /dev/null
+++ b/app-misc/logserial/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <longdescription lang="en">
+ Package for loging incoming bytes on asynchronous serial ports. It was
+ written for loging calls on our telephone central, but you can use it
+ for any devices connected to serial ports.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/lsx-0.1-r1 b/app-misc/lsx-0.1-r1
deleted file mode 100644
index 07e88258f813..000000000000
--- a/app-misc/lsx-0.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=list executables
-EAPI=6
-HOMEPAGE=https://web.archive.org/web/20160104002819/http://tools.suckless.org:80/lsx
-KEYWORDS=amd64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/lsx-0.1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=65d36db04e3bba28fa950a377318b6b5
diff --git a/app-misc/lsx/Manifest b/app-misc/lsx/Manifest
new file mode 100644
index 000000000000..e71e3d9583cc
--- /dev/null
+++ b/app-misc/lsx/Manifest
@@ -0,0 +1,3 @@
+DIST lsx-0.1.tar.gz 2130 BLAKE2B 0293945b76d76d755675d8d57ef7f09b668d0df7997ec0e5df927dfb4dcd6d24217b27e114c498680028c52bb21c8a1106dbde2010c47d77d66acf9589e74a9d SHA512 19f3fa4ecc22817332716d58d287ab7ea4b07bbed1d909b00931b272f1613d8aeb315435495d51a5f918f53e3f0ce68e964813cdbfefce0176924f3c75aa623a
+EBUILD lsx-0.1-r1.ebuild 852 BLAKE2B acf329ff72e9e47a73fccd133575858cf36cdac05f6078e6d48b803907405f780fdf15fc98eb6efdf43f37a91977905a52383651e5c7e67013ce03488f8a93dc SHA512 51d0adb918d04d522156ec631560bd2f83afaaed1661401e002f92ab27b4943f87f5ff0465cafbe80e9d7a588b256060770c7aab0b8e7c25a8148ed5c4707b7c
+MISC metadata.xml 277 BLAKE2B b9389d5db9efc1f16568f1fce62c47e9fd8829608aa3084db3decedefa711e065af20f29b0c5a2d9e93beac60ed0f54d098640e56fb93824dcb0b3d2f75af7bf SHA512 99cfc61af14bb324d776b6865339d8f9626450ba2f837bced0624ed80aad5f177c35c4ac3e3cfe636d175ad1f7eb478cc735dde57a6bb691fd608c57253db1c4
diff --git a/app-misc/lsx/lsx-0.1-r1.ebuild b/app-misc/lsx/lsx-0.1-r1.ebuild
new file mode 100644
index 000000000000..1cfccc2c3cd2
--- /dev/null
+++ b/app-misc/lsx/lsx-0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="list executables"
+HOMEPAGE="https://web.archive.org/web/20160104002819/http://tools.suckless.org:80/lsx"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DOCS=( README )
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s/.*strip.*//" \
+ Makefile || die "sed failed"
+
+ sed -i \
+ -e "s/CFLAGS = -Os/CFLAGS +=/" \
+ -e "s/LDFLAGS =/LDFLAGS +=/" \
+ config.mk || die "sed failed"
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="/usr" install
+
+ # collision with net-dialup/lrzsz
+ mv "${D}/usr/bin/${PN}" "${D}/usr/bin/${PN}-suckless" || die
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "Run ${PN} with ${PN}-suckless"
+}
diff --git a/app-misc/lsx/metadata.xml b/app-misc/lsx/metadata.xml
new file mode 100644
index 000000000000..fddc83784ddf
--- /dev/null
+++ b/app-misc/lsx/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Prints all executable file names of given absolute paths to standard output</longdescription>
+</pkgmetadata>
diff --git a/app-misc/ltunify-0.2-r1 b/app-misc/ltunify-0.2-r1
deleted file mode 100644
index 24fafb64078b..000000000000
--- a/app-misc/ltunify-0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Tool for working with Logitech Unifying receivers and devices
-EAPI=5
-HOMEPAGE=https://lekensteyn.nl/logitech-unifying.html https://git.lekensteyn.nl/ltunify/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=https://git.lekensteyn.nl/ltunify/snapshot/ltunify-0.2.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
-_md5_=17df96437174feeb249047a216f1633c
diff --git a/app-misc/ltunify/Manifest b/app-misc/ltunify/Manifest
new file mode 100644
index 000000000000..8e363e55c881
--- /dev/null
+++ b/app-misc/ltunify/Manifest
@@ -0,0 +1,3 @@
+DIST ltunify-0.2.tar.gz 28897 BLAKE2B 5a8b7b86515f41d939b4774afc8c97d7600f6c1c58203a58ec46027138ffc60fc1f0f917c915642ccc5561a311b8d45da39370a71af13b03e51249792d233360 SHA512 e6eaf5c3ef555712219a3edd74d8d8edd3380908cd08dc5168a07111ddb7bf7d0e3d1a5eaf90f6e7ac9faf0474c31827ba0f9f511f170ab8900f0b90f65aa85a
+EBUILD ltunify-0.2-r1.ebuild 825 BLAKE2B e3ca1adfdc5e2211f3c6b1212c10b3dec55dd3aa65c3a684162e7f76592e7c728a8db6ad439478ce3db46e2f101eceea0db882a68e14ae7cea3962d4155ed487 SHA512 12423c54f006c2b18bd1b8b48602763760aa77eeedec944c7b842debd2944091883cfc9d1247dacfb183d95ff30f9e11ecbcf171ffdd2001b73910dca97a1c38
+MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-misc/ltunify/ltunify-0.2-r1.ebuild b/app-misc/ltunify/ltunify-0.2-r1.ebuild
new file mode 100644
index 000000000000..25d12814cc05
--- /dev/null
+++ b/app-misc/ltunify/ltunify-0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs udev
+
+DESCRIPTION="Tool for working with Logitech Unifying receivers and devices"
+HOMEPAGE="https://lekensteyn.nl/logitech-unifying.html https://git.lekensteyn.nl/ltunify/"
+SRC_URI="https://git.lekensteyn.nl/${PN}/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ sed -i '/^override CFLAGS/d' Makefile || die
+
+ # allow plugdev group r/w access
+ sed -i 's/^#MODE=/MODE=/' udev/42-logitech-unify-permissions.rules || die
+
+ tc-export CC
+}
+
+src_compile() {
+ emake ${PN}
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc NEWS README.txt
+
+ # avoid file collision with solaar
+ udev_newrules udev/42-logitech-unify-permissions.rules 42-logitech-unify-${PN}.rules
+}
diff --git a/app-misc/ltunify/metadata.xml b/app-misc/ltunify/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/app-misc/ltunify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/lxsplit-0.2.4 b/app-misc/lxsplit-0.2.4
deleted file mode 100644
index 1fa9c7a9ada8..000000000000
--- a/app-misc/lxsplit-0.2.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Command-line file splitter/joiner for Linux
-EAPI=0
-HOMEPAGE=http://lxsplit.sourceforge.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxsplit/lxsplit-0.2.4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=03803e143935642e8b2800160c1d0931
diff --git a/app-misc/lxsplit-0.2.4-r1 b/app-misc/lxsplit-0.2.4-r1
deleted file mode 100644
index 2d145a2c3497..000000000000
--- a/app-misc/lxsplit-0.2.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Command-line file splitter/joiner for Linux
-EAPI=6
-HOMEPAGE=http://lxsplit.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/lxsplit/lxsplit-0.2.4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3a9f3ad4706169bce47cd5e89ab22e93
diff --git a/app-misc/lxsplit/Manifest b/app-misc/lxsplit/Manifest
new file mode 100644
index 000000000000..ec9295fe498e
--- /dev/null
+++ b/app-misc/lxsplit/Manifest
@@ -0,0 +1,4 @@
+DIST lxsplit-0.2.4.tar.gz 14663 BLAKE2B 48b68304042e728bbf36f22ee10d31b8b42deb3c39bfdca93589cf9417fc0f544c3953b661e06f8f451f71a5a9137348523d563b0db57fae335f9d06be9315a0 SHA512 2483010752177232801029b969a01a2702830c47e5d6a185784d9d945b792aecb778241d08d97cc0c02977afec02bf3f6a20e24da2fdbecad2dcef1de95b0575
+EBUILD lxsplit-0.2.4-r1.ebuild 474 BLAKE2B 4c3aa68845f54cff842b6217ad57613b0802c129fd4cb58fbcc24591c8b8c8e893b8280a90c659846b41642086de6ae35d421c52e64be3eb469ed1342b1b3dd6 SHA512 f78af4c11312d4d93f2b06230996271e77f5a8a8a3d5f984f0b8fa3e2dbe5864a89f200400d2a0573a51c01e375e34e51900b93060263a856882606fadc1ce2c
+EBUILD lxsplit-0.2.4.ebuild 510 BLAKE2B 4b1bd18d2462ba6ceef63229906c7f9856e96c2d4009272b049926ed808d032b35750bc5580970073bfd0e8a8775664506876a4236e82589124b0bcc1b1c0ab1 SHA512 182092bdd7d55324ffe448d4de10ea49e2ed44ca627e0a0c9f6f835fb8f8f84c1a41c1b48e21dfeaeb94a2d21fc128605b731e9c7911a2a2c9fc9c2d2f842d9c
+MISC metadata.xml 342 BLAKE2B 4e7c287726a2d2590676082ba973d3253244ca1bc9185ae76f403bc892302cefa17032765c8f72bee607e986ff56a31e0f5a8aa629c328092fb3bb813337dbc0 SHA512 3fd31f236a871424340ae802b5ba0c79dabfed4f309662b74885c56e772fbb7e83bc945430cd25fa0772d5aa550735d662c03bf653c607a77a94dbeee95f6344
diff --git a/app-misc/lxsplit/lxsplit-0.2.4-r1.ebuild b/app-misc/lxsplit/lxsplit-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..8d9b02a71df7
--- /dev/null
+++ b/app-misc/lxsplit/lxsplit-0.2.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line file splitter/joiner for Linux"
+HOMEPAGE="http://lxsplit.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxsplit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_compile() {
+ tc-export CC
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ einstalldocs
+ dobin "${PN}"
+}
diff --git a/app-misc/lxsplit/lxsplit-0.2.4.ebuild b/app-misc/lxsplit/lxsplit-0.2.4.ebuild
new file mode 100644
index 000000000000..b4cf94587c86
--- /dev/null
+++ b/app-misc/lxsplit/lxsplit-0.2.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line file splitter/joiner for Linux"
+HOMEPAGE="http://lxsplit.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxsplit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_compile() {
+ tc-export CC
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+ dobin lxsplit || die
+ dodoc ChangeLog README || die
+}
diff --git a/app-misc/lxsplit/metadata.xml b/app-misc/lxsplit/metadata.xml
new file mode 100644
index 000000000000..2850c5099da3
--- /dev/null
+++ b/app-misc/lxsplit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">lxsplit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/matew-1.9 b/app-misc/matew-1.9
deleted file mode 100644
index e354510f5013..000000000000
--- a/app-misc/matew-1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Make Album The Easy Way (Matew) is an HTML/CSS generator for static image albums
-EAPI=0
-HOMEPAGE=http://inquisb.github.io/matew/
-KEYWORDS=~x86 ~ppc ~amd64
-LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick app-shells/bash sys-apps/coreutils
-SLOT=0
-SRC_URI=mirror://sourceforge/matew/matew-1.9.tar.bz2
-_md5_=89128e3c6bea218136896f97b04424d7
diff --git a/app-misc/matew/Manifest b/app-misc/matew/Manifest
new file mode 100644
index 000000000000..d577de3c5859
--- /dev/null
+++ b/app-misc/matew/Manifest
@@ -0,0 +1,3 @@
+DIST matew-1.9.tar.bz2 29690 BLAKE2B 4bdfca7952ca072d0b2d7749ca9b8a8160db5bb843c600b74439eab1cc38b4302440adfa2e168ba915b27ccd628f693ceca1c4e2976b1ee5346740116a18ea9d SHA512 3d4f37c16567cd93b7a699c4d5f01cd655b57b79aa865aed11cb8aab7afb6cc5dc2cba9aa59f72128efa179e08eb95b1226d068e3ae15aec063bb252d9fa77b9
+EBUILD matew-1.9.ebuild 911 BLAKE2B a02a8f2df7bd4c374804ff31f503ec2346c942bc0b628319d0a8163b3e0e4e2e8edc3c044c3eb8f61ff793078d08e6f45ae2eb5567b3bbca2bd2b607fca8f07e SHA512 05441d755fa2c558c4d8cb756e8db3688ff09740bb08f1e3dc6ee7fc6ac9fa86957737a0831c408310ace2bd9f55c780cf91e90fe599ab1ac4ca4993d6bbfe17
+MISC metadata.xml 325 BLAKE2B 98c366a68f5000ec12123f37448baf0f84f2c20ec3724090aaee26029f1bee73090837e446af84e5eec9598749e86a6a9cfb696961fd212f421153f840492908 SHA512 6e9710e9171b11accdf474198ff959c8bf47e8601f156f57885b59a8dd0f81312478ed104111af45578732763127704cfea3dd1ecc51008b26b4c3b8fad46eef
diff --git a/app-misc/matew/matew-1.9.ebuild b/app-misc/matew/matew-1.9.ebuild
new file mode 100644
index 000000000000..7d27f1b42561
--- /dev/null
+++ b/app-misc/matew/matew-1.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="Make Album The Easy Way (Matew) is an HTML/CSS generator for static image albums"
+HOMEPAGE="http://inquisb.github.io/matew/"
+SRC_URI="mirror://sourceforge/matew/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ media-gfx/imagemagick
+ app-shells/bash
+ sys-apps/coreutils
+"
+
+src_install() {
+ dobin "${S}"/src/matew "${S}"/src/matew-cleanup "${S}"/src/matew-wizard
+ insinto /etc/matew/styles
+ doins "${S}"/src/styles/*
+ insinto /etc/matew/languages
+ doins "${S}"/src/languages/*
+ dodoc "${S}"/doc/AUTHOR "${S}"/doc/ChangeLog "${S}"/doc/README \
+ "${S}"/doc/THANKS "${S}"/doc/TODO
+ doman "${S}"/doc/man/matew.1.gz
+}
+
+pkg_postinst() {
+ elog "Matew files installed successfully!"
+ elog "Run matew-wizard and read instructions."
+}
diff --git a/app-misc/matew/metadata.xml b/app-misc/matew/metadata.xml
new file mode 100644
index 000000000000..0e69e0af3dc3
--- /dev/null
+++ b/app-misc/matew/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">matew</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/mc-4.8.20-r1 b/app-misc/mc-4.8.20-r1
deleted file mode 100644
index 3ba45d5f03f8..000000000000
--- a/app-misc/mc-4.8.20-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.20.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c142991e8ca47f9eda39cd3515521e3
diff --git a/app-misc/mc-4.8.20-r2 b/app-misc/mc-4.8.20-r2
deleted file mode 100644
index 11061f473cf1..000000000000
--- a/app-misc/mc-4.8.20-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.20.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44ce7d950956b4e80ad332ffe6c39a79
diff --git a/app-misc/mc-4.8.21 b/app-misc/mc-4.8.21
deleted file mode 100644
index 3bc4bbe39c96..000000000000
--- a/app-misc/mc-4.8.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst pretend
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.21.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4af42b76e974efdf18f801c92ba1096a
diff --git a/app-misc/mc-9999 b/app-misc/mc-9999
deleted file mode 100644
index af65a0d342ce..000000000000
--- a/app-misc/mc-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend unpack
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b24d633c6e0e989ab3299d21d5fb90b7
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
new file mode 100644
index 000000000000..35b1e498df4b
--- /dev/null
+++ b/app-misc/mc/Manifest
@@ -0,0 +1,9 @@
+AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b83638f4e72379f8756e62376c61ef3375c9ede50deb52619ead78a39d49280f9a654e0d8877158b6ef4b8117556 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c
+AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c
+DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
+DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
+EBUILD mc-4.8.20-r1.ebuild 2482 BLAKE2B 1bf8934ae7f8d5478804017453efc0a8d16e1f6b2f8bedd8d878202df154fa01138e5284f18a4a5e3a7ca11b70785fcf250275b45941e4b411a045142a3e0705 SHA512 6345f42e21960543ccd50ee95790c017667f73a293386ad28a6107e4575e649902b8e26970185f3ef59d8ef23f4a45b02596d0f99156c704083ab15f54f87384
+EBUILD mc-4.8.20-r2.ebuild 2619 BLAKE2B 818c6c1ab7b190d80566935453e3467479733e266683e17f02c397d6d55bc2ad3a9aeacad91e4c2ad7dd6e26e9a6319b1392726a097415d5302dc49a9daf7843 SHA512 50e29ca64ea1e6172653960220e8bee6b7a298792e7774971a7c3db6a3187646ae84a88291ba0deb898ca6294fd752b827b0213ea7d770a078edd9f506abd0cc
+EBUILD mc-4.8.21.ebuild 2425 BLAKE2B c1fd699e82c24ac68898dbb3a67eb61c9a5bcc27f2c31a6cb2c76adaba25651f18f24eafc9434b36144cbec1fc4451d306cb8661cf433217f973ce5b24077317 SHA512 806b4dc06c0afcfecbd5a00469e85fbfb115b2645df2c504c79f8788fd6e0248155b0c8e728580b8b12ee74e091f8f8ade41bd57e5c2c8eb86abdb9318b1d928
+EBUILD mc-9999.ebuild 2710 BLAKE2B acbcdaf95260df5b4f34ac03e19b2b674f65d3c95083e79eaf916cd62f99ea0d9008c94bb2c0e030bcd8face202c00a646eca1521461058ae009da1f17a4499e SHA512 0388200a8134818d797d79849bc618a222377c33fb1802dcbf2fdafcbc22d85888171fee546ff5a484aeb4d97074afa1fea23ea5ee2078182bf72277658b65bb
+MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch
new file mode 100644
index 000000000000..761c103df654
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.13-tinfo.patch
@@ -0,0 +1,39 @@
+Gentoo-bug: https://bugs.gentoo.org/527118
+--- a/m4.include/mc-with-screen-ncurses.m4
++++ b/m4.include/mc-with-screen-ncurses.m4
+@@ -101,6 +101,9 @@
+ LIBS=
+ AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
+ [AC_MSG_ERROR([Cannot find ncurses library])])
++ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+
+ screen_type=ncurses
+ screen_msg="Ncurses library"
+@@ -111,10 +114,15 @@
+ AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
+ [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
+
++ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+ if test x"$ncursesw_found" = "x"; then
+ LIBS=
+ AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
+ [AC_MSG_ERROR([Cannot find ncurses library])])
++ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
+ fi
+
+ dnl Check the header
+@@ -166,6 +174,9 @@
+ LIBS=
+ AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
+ [AC_MSG_ERROR([Cannot find ncursesw library])])
++ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+
+ dnl Check the header
+ ncurses_h_found=
diff --git a/app-misc/mc/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
new file mode 100644
index 000000000000..06d6f46ff325
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.19-selected-size.patch
@@ -0,0 +1,30 @@
+From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sat, 2 Dec 2017 14:39:50 +0300
+Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
+
+The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ lib/util.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/util.c b/lib/util.c
+index 0326f65e8..c23d91fba 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
+ p += strlen (p) - 1;
+ d = x + sizeof (x) - 1;
+ *d-- = '\0';
+- while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
++ /* @size format is "size unit", i.e. "[digits][space][letters]".
++ Copy all charactes after digits. */
++ while (p >= y && !g_ascii_isdigit (*p))
+ *d-- = *p--;
+ for (count = 0; p >= y; count++)
+ {
+--
+2.15.1
+
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
new file mode 100644
index 000000000000..344079ed4251
--- /dev/null
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:0= )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+ "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myscreen=ncurses
+ use slang && myscreen=slang
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local homedir=".mc"
+ use xdg && homedir="XDG"
+
+ econf \
+ --disable-silent-rules \
+ --disable-dependency-tracking \
+ $(use_enable nls) \
+ --enable-vfs \
+ $(use_enable kernel_linux vfs-undelfs) \
+ --enable-charset \
+ $(use_with X x) \
+ $(use_enable samba vfs-smb) \
+ $(use_enable sftp vfs-sftp) \
+ $(use_enable spell aspell) \
+ $(use_with gpm gpm-mouse) \
+ --with-screen=${myscreen} \
+ $(use_with edit internal-edit) \
+ $(use_enable mclib) \
+ $(use_enable test tests) \
+ --with-homedir=${homedir}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
new file mode 100644
index 000000000000..9b920e68246d
--- /dev/null
+++ b/app-misc/mc/mc-4.8.20-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:0=[unicode?] )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+ "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if use slang && use unicode ; then
+ ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+ fi
+}
+
+src_prepare() {
+ [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --disable-silent-rules
+ --enable-charset
+ --enable-vfs
+ --with-homedir=$(usex xdg 'XDG' '.mc')
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+ $(use_enable kernel_linux vfs-undelfs)
+ $(use_enable mclib)
+ $(use_enable nls)
+ $(use_enable samba vfs-smb)
+ $(use_enable sftp vfs-sftp)
+ $(use_enable spell aspell)
+ $(use_enable test tests)
+ $(use_with gpm gpm-mouse)
+ $(use_with X x)
+ $(use_with edit internal-edit)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-4.8.21.ebuild b/app-misc/mc/mc-4.8.21.ebuild
new file mode 100644
index 000000000000..a7b19052bb2f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.21.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:0=[unicode?] )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if use slang && use unicode ; then
+ ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+ fi
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --disable-silent-rules
+ --enable-charset
+ --enable-vfs
+ --with-homedir=$(usex xdg 'XDG' '.mc')
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+ $(use_enable kernel_linux vfs-undelfs)
+ $(use_enable mclib)
+ $(use_enable nls)
+ $(use_enable samba vfs-smb)
+ $(use_enable sftp vfs-sftp)
+ $(use_enable spell aspell)
+ $(use_enable test tests)
+ $(use_with gpm gpm-mouse)
+ $(use_with X x)
+ $(use_with edit internal-edit)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
new file mode 100644
index 000000000000..ef5501c8bc47
--- /dev/null
+++ b/app-misc/mc/mc-9999.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git git://repo.or.cz/midnight-commander.git"
+ LIVE_ECLASSES="git-r3 autotools"
+ LIVE_EBUILD=yes
+fi
+
+inherit flag-o-matic ${LIVE_ECLASSES}
+
+MY_P=${P/_/-}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:0=[unicode?] )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+pkg_pretend() {
+ if use slang && use unicode ; then
+ ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+ fi
+}
+
+src_prepare() {
+ default
+
+ [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --disable-silent-rules
+ --enable-charset
+ --enable-vfs
+ --with-homedir=$(usex xdg 'XDG' '.mc')
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+ $(use_enable kernel_linux vfs-undelfs)
+ $(use_enable mclib)
+ $(use_enable nls)
+ $(use_enable samba vfs-smb)
+ $(use_enable sftp vfs-sftp)
+ $(use_enable spell aspell)
+ $(use_enable test tests)
+ $(use_with gpm gpm-mouse)
+ $(use_with X x)
+ $(use_with edit internal-edit)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS doc/{FAQ,NEWS,README}
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
new file mode 100644
index 000000000000..35fa1001c11e
--- /dev/null
+++ b/app-misc/mc/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <use>
+ <flag name="edit">Compile and install the mcedit application</flag>
+ <flag name="mclib">Compile and install the libmc.so shared library</flag>
+ <flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag>
+ <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
+ <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/media-player-info-23 b/app-misc/media-player-info-23
deleted file mode 100644
index 85a2a92ed6e9..000000000000
--- a/app-misc/media-player-info-23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst setup
-DEPEND=>=virtual/udev-208 || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) virtual/pkgconfig
-DESCRIPTION=A repository of data files describing media player capabilities
-EAPI=7
-HOMEPAGE=https://cgit.freedesktop.org/media-player-info/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86
-LICENSE=BSD
-RDEPEND=>=virtual/udev-208
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/media-player-info/media-player-info-23.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e9b0dadd27cea2c0cf1240f8158b12bb
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
new file mode 100644
index 000000000000..9f149b19c795
--- /dev/null
+++ b/app-misc/media-player-info/Manifest
@@ -0,0 +1,3 @@
+DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
+EBUILD media-player-info-23.ebuild 1056 BLAKE2B 9235326e34617c91bcb8fcdaa431bc97c3be2b3c4f2f92f356052108b46bbc264e6058697922d4fc15c26564aaee8ee3b355354b8fa3e6ddd8e9f4d00e77335a SHA512 b33469c2c3400ed93b12c86e543a44d0730e393793544b99b56089761488eebee7eb15136f8bb1380dad7c6815ae34ca8c7abf27cadaf6d8c953281a95b51a95
+MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
new file mode 100644
index 000000000000..b5c5cdff697d
--- /dev/null
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit python-any-r1
+
+DESCRIPTION="A repository of data files describing media player capabilities"
+HOMEPAGE="https://cgit.freedesktop.org/media-player-info/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+IUSE=""
+
+# https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
+RDEPEND=">=virtual/udev-208"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+pkg_postinst() {
+ # Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
+ udevadm hwdb --update --root="${ROOT%/}"
+ # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+ if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+ return 0
+ fi
+ udevadm control --reload
+}
diff --git a/app-misc/media-player-info/metadata.xml b/app-misc/media-player-info/metadata.xml
new file mode 100644
index 000000000000..d80c2d3fce7b
--- /dev/null
+++ b/app-misc/media-player-info/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/mediacrush-cli-1.1.2 b/app-misc/mediacrush-cli-1.1.2
deleted file mode 100644
index 8afec207bc23..000000000000
--- a/app-misc/mediacrush-cli-1.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-text/asciidoc
-DESCRIPTION=A bash script for working with MediaCrush from a shell
-EAPI=5
-HOMEPAGE=https://github.com/MediaCrush/MediaCrush-cli
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-editors/vim-core net-misc/curl sys-apps/file sys-apps/sed
-SLOT=0
-SRC_URI=https://github.com/MediaCrush/MediaCrush-cli/archive/1.1.2.tar.gz -> mediacrush-cli-1.1.2.tar.gz
-_md5_=b0a66b6dfd387c4626d49a71184a866a
diff --git a/app-misc/mediacrush-cli-9999 b/app-misc/mediacrush-cli-9999
deleted file mode 100644
index 65adb4c405b6..000000000000
--- a/app-misc/mediacrush-cli-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=app-text/asciidoc >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A bash script for working with MediaCrush from a shell
-EAPI=5
-HOMEPAGE=https://github.com/MediaCrush/MediaCrush-cli
-LICENSE=MIT
-RDEPEND=net-misc/curl sys-apps/file sys-apps/sed
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=6190ba0dd649ddf0c67a6da911bfe248
diff --git a/app-misc/mediacrush-cli/Manifest b/app-misc/mediacrush-cli/Manifest
new file mode 100644
index 000000000000..66fd31509f58
--- /dev/null
+++ b/app-misc/mediacrush-cli/Manifest
@@ -0,0 +1,4 @@
+DIST mediacrush-cli-1.1.2.tar.gz 3299 BLAKE2B d3235ef82e7c6dc4ff0c19662514dc848b34904b19105c49343a91b401ea2611e4d090f586a06521f3e0d55e336027456507fbcbe2eed0ada9d0f0765556af12 SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c
+EBUILD mediacrush-cli-1.1.2.ebuild 926 BLAKE2B 8318ece130c2df64cb954546c1f01ac8e9efccd066d7f13420e29047067c99953764eee5b84e39c23bf966ae73196ae7e97834d2e9e4944ef954655b136f0b42 SHA512 63a417b5a6f1c313fc93f9817f9f3a83379988da52dd3b030b4bcd89107322f4f2fcc247d9a3129bbb9851f6da00457c02c84a35f8e83927dd878aaa947ce4fb
+EBUILD mediacrush-cli-9999.ebuild 904 BLAKE2B 223c4dcb5a9fb268df9092a5db4816777f36d5656d6d0d68b1cf98972f62448882c5cdfab0fc0213c2d234d0c94dc4571400f937edda259f40e0743ff37ce520 SHA512 68217126fbf9b6710a5d7665325990ce3ab93fedc83e88601c4dcb646cae0653957d1b7b93191321a9c7b23ac7ebb4b0414ed92b8589ec571361803cea58dee4
+MISC metadata.xml 349 BLAKE2B 013521e1641d996ada74b8ae2c144aebb6c07357439aa9a87d91d6041d0f0333ce5b21b6e5c99888884a671313fd12d2d5f00061e22c81a03cf2af0e1e9ba2c9 SHA512 4e8de7d17a63a033642e04784a463efaed8d6f832288fe1706e7bf3c7f03bee20cd89a4745473dad8230cb6383128d466fb4616c295d66fd47274bc5ea07ef32
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
new file mode 100644
index 000000000000..7ccf263f351a
--- /dev/null
+++ b/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/MediaCrush/MediaCrush-cli.git"
+ SRC_URI=""
+ KEYWORDS=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/MediaCrush/MediaCrush-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/MediaCrush-cli-${PV}"
+fi
+
+DESCRIPTION="A bash script for working with MediaCrush from a shell"
+HOMEPAGE="https://github.com/MediaCrush/MediaCrush-cli"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ app-text/asciidoc
+"
+RDEPEND="
+ app-editors/vim-core
+ net-misc/curl
+ sys-apps/file
+ sys-apps/sed
+"
+
+src_compile() {
+ a2x --doctype manpage --format manpage mediacrush.1.txt
+}
+
+src_install() {
+ dobin mediacrush
+ doman mediacrush.1
+
+ if ! has_version x11-misc/xdg-utils; then
+ einfo "Install x11-misc/xdg-utils to enable '--open' argument"
+ fi
+}
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
new file mode 100644
index 000000000000..c0f0b0e722b7
--- /dev/null
+++ b/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/MediaCrush/MediaCrush-cli.git"
+ SRC_URI=""
+ KEYWORDS=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/MediaCrush/MediaCrush-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/MediaCrush-cli-${PV}"
+fi
+
+DESCRIPTION="A bash script for working with MediaCrush from a shell"
+HOMEPAGE="https://github.com/MediaCrush/MediaCrush-cli"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ app-text/asciidoc
+"
+RDEPEND="
+ net-misc/curl
+ sys-apps/file
+ sys-apps/sed
+"
+
+src_compile() {
+ a2x --doctype manpage --format manpage mediacrush.1.txt
+}
+
+src_install() {
+ dobin mediacrush
+ doman mediacrush.1
+
+ if ! has_version x11-misc/xdg-utils; then
+ einfo "Install x11-misc/xdg-utils to enable '--open' argument"
+ fi
+}
diff --git a/app-misc/mediacrush-cli/metadata.xml b/app-misc/mediacrush-cli/metadata.xml
new file mode 100644
index 000000000000..9879dc1ac464
--- /dev/null
+++ b/app-misc/mediacrush-cli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">MediaCrush/MediaCrush-cli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/mencal-3.0 b/app-misc/mencal-3.0
deleted file mode 100644
index f2ca2b45861b..000000000000
--- a/app-misc/mencal-3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=Calendar to track menstruation cycles
-EAPI=6
-HOMEPAGE=http://www.kyberdigi.cz/projects/mencal/english.html
-KEYWORDS=amd64 ~ppc sparc ~mips alpha ~hppa ia64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.kyberdigi.cz/projects/mencal/files/mencal-3.0.tar.gz
-_md5_=d5b09c20d58f531f94589d9a6f974eef
diff --git a/app-misc/mencal/Manifest b/app-misc/mencal/Manifest
new file mode 100644
index 000000000000..64ee1920cbd7
--- /dev/null
+++ b/app-misc/mencal/Manifest
@@ -0,0 +1,3 @@
+DIST mencal-3.0.tar.gz 19560 BLAKE2B 741628e02756cce02386f6439a015c9c1bf8801c1eaf136a761f2dc823b38d746d8e4af23e7c22ec0147f153130c11dd01912f477ffcdd75bf0141b1cdc23276 SHA512 0a99af941b9cea4923a90065813d8434c908d52e4ead1309114a28b565ca8b8e81cf132740be4ab88159b61628c22fba65cd8a74213b58d4db69a2f315d737eb
+EBUILD mencal-3.0.ebuild 505 BLAKE2B cb73b2191932c3b7e9491331f043d55003c8abcf961647745ac820ba4f4bd6d8996b1600a53cd719a1c454c16088c72f025a1d30efc86d11f9951702f0734120 SHA512 a197eed220ad36f06ad90574da47e019d5c92038ce83bd1056ff52182b7e92574dd66b16539b6c20dece2a5b56584df23a8170c307e42c3b430bab40b9261a7e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mencal/mencal-3.0.ebuild b/app-misc/mencal/mencal-3.0.ebuild
new file mode 100644
index 000000000000..0e2e70652cbc
--- /dev/null
+++ b/app-misc/mencal/mencal-3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Calendar to track menstruation cycles"
+HOMEPAGE="http://www.kyberdigi.cz/projects/mencal/english.html"
+SRC_URI="http://www.kyberdigi.cz/projects/mencal/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc ~mips alpha ~hppa ia64 ~ppc64 x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+src_install() {
+ dobin "${PN}"
+ einstalldocs
+}
diff --git a/app-misc/mencal/metadata.xml b/app-misc/mencal/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/mencal/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/mepl-0.45-r1 b/app-misc/mepl-0.45-r1
deleted file mode 100644
index 0f0715589df1..000000000000
--- a/app-misc/mepl-0.45-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Self-employed-mode software for 3COM/USR message modems
-EAPI=6
-HOMEPAGE=https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.hof-berlin.de/mepl/mepl0.45.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2bcc6ae288f0f37c79fc1e0f2a79e78a
diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
new file mode 100644
index 000000000000..ccacba6603b1
--- /dev/null
+++ b/app-misc/mepl/Manifest
@@ -0,0 +1,4 @@
+AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
+DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
+EBUILD mepl-0.45-r1.ebuild 701 BLAKE2B b19b056179fffb66034fd1220844505a1d4b364691e1594f0834184937658b19ae428b58034710a2c24952d3fdee0729a1f20a9362262b6ab6a28de10d995a34 SHA512 ab07d182efc4103b760f5ba26ddefccf4e038f38e3e1ac91f1143fdb3a12ed630a1ba5a541ddee00e32b3c9e145101b0aa9ded597c02ffa507e1e60b7cf56add
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mepl/files/mepl-0.45-gcc433.patch b/app-misc/mepl/files/mepl-0.45-gcc433.patch
new file mode 100644
index 000000000000..0fd857a9ae30
--- /dev/null
+++ b/app-misc/mepl/files/mepl-0.45-gcc433.patch
@@ -0,0 +1,16 @@
+--- a/mepl.c 2009-04-07 21:17:32.000000000 +0200
++++ b/mepl.c 2009-04-07 21:16:48.000000000 +0200
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #define VERSION "0.45 Don Nov 25 19:13:58 CET 1999"
+ /* Version: @(#) mepl.c 0.45
+ Autor: Frank Holtz <frank@hof-berlin.de>--- mepl.c 2009-04-07 21:08:18.000000000 +0200
+@@ -347,7 +347,7 @@
+ errz=0;
+ do {
+ error=0;
+- resout=open(resdat,O_WRONLY | O_TRUNC | O_CREAT); /* In Datei zwischenspeichern */
++ resout=open(resdat,O_WRONLY | O_TRUNC | O_CREAT,0600); /* In Datei zwischenspeichern */
+ sendstr(ATSENDMEM);
+ line[2]=0;
+ /* Erstes Zeichen suchen */
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r1.ebuild
new file mode 100644
index 000000000000..260918797539
--- /dev/null
+++ b/app-misc/mepl/mepl-0.45-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Self-employed-mode software for 3COM/USR message modems"
+HOMEPAGE="https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/"
+SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc433.patch" )
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DMEPLCONFIG=\\\"/etc/mepl.conf\\\" ${LDFLAGS}" en
+}
+
+src_install() {
+ dobin "${PN}" "${PN}mail"
+ insinto /etc
+ doins "${PN}.conf"
+ newman "${PN}.en" "${PN}.7"
+}
diff --git a/app-misc/mepl/metadata.xml b/app-misc/mepl/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/mepl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/metadata.xml b/app-misc/metadata.xml
new file mode 100644
index 000000000000..98bcf3dff285
--- /dev/null
+++ b/app-misc/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-misc category contains various miscellaneous application
+ packages which don't belong anywhere else.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-misc enthält verschiedenste Applikationen welche
+ keiner anderen Kategorie zugeordnet werden konnten.
+ </longdescription>
+ <longdescription lang="nl">
+ De app-misc categorie bevat applicaties die niet in een specifieke
+ categorie geplaatst konden worden.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm app-misc chứa các ứng dụng linh tinh, không thuộc
+ vỠnhóm nào cả.
+ </longdescription>
+ <longdescription lang="it">
+ La cateogria app-misc contiene varie applicazioni che non ricadono nelle altre categorie.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria app-misc contém vários pacotes de aplicações mistas
+ que não pertencem a outros lugares.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria app-misc zawiera wiele rozmaitych programów, które nie
+ pasowały do żadnej innej kategorii.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría app-misc contiene varios paquetes de aplicaciones
+ misceláneas que no pertenecen a ninguna otra categoría.
+ </longdescription>
+</catmetadata>
+
diff --git a/app-misc/metromap-0.1.4-r1 b/app-misc/metromap-0.1.4-r1
deleted file mode 100644
index 98182614ab3a..000000000000
--- a/app-misc/metromap-0.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps
-EAPI=5
-HOMEPAGE=http://metromap.antex.ru/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://metromap.antex.ru/metromap-0.1.4.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e51b740e2bf906e695fb94ca1ff8c3a
diff --git a/app-misc/metromap/Manifest b/app-misc/metromap/Manifest
new file mode 100644
index 000000000000..115c8e0d0e1d
--- /dev/null
+++ b/app-misc/metromap/Manifest
@@ -0,0 +1,3 @@
+DIST metromap-0.1.4.tar.bz2 3419243 BLAKE2B d0072d4414657bc6314a972e635809ce239be4b081368ccef44c8549eea646cfbaa20ac30621e9dafc5ee1419a5916fa62274b77392d1d437b7af3561dfb18c9 SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec
+EBUILD metromap-0.1.4-r1.ebuild 961 BLAKE2B 472e0393ada3c9999e9a9ace054e7ca65cdeb6f525acb8fdd2a403197fed82151386a576be1101fa2cdffbd53d51ea4b0f229d4e76bbb739262740cd02bf102e SHA512 ec656cad496e2078f39b7a661f41392ee85c54c1305de4af8dedcce93ed938159fa14c10d59a7e64f79b720a01222d4c8347478734351d1ca728eb6caee4ab88
+MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/app-misc/metromap/metadata.xml b/app-misc/metromap/metadata.xml
new file mode 100644
index 000000000000..ceeed1534bdd
--- /dev/null
+++ b/app-misc/metromap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/metromap/metromap-0.1.4-r1.ebuild b/app-misc/metromap/metromap-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..6d0dba3d4e4d
--- /dev/null
+++ b/app-misc/metromap/metromap-0.1.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 gnome2-utils
+
+DESCRIPTION="Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps"
+HOMEPAGE="http://metromap.antex.ru/"
+SRC_URI="http://metromap.antex.ru/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_prepare() {
+ python_fix_shebang .
+ sed -e 's,Gtk;,GTK;,' -i metromap.desktop || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ emake DESTDIR="${ED}"/usr install
+ python_optimize "${ED}"/usr/share/metromap/modules/
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/mime-types-9 b/app-misc/mime-types-9
deleted file mode 100644
index 594ae3237e52..000000000000
--- a/app-misc/mime-types-9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Provides /etc/mime.types file
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/mime-types-9.tar.bz2
-_md5_=6f8b6f6a5798bac0a0b61fb93dd77509
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
new file mode 100644
index 000000000000..887e68a56a6f
--- /dev/null
+++ b/app-misc/mime-types/Manifest
@@ -0,0 +1,3 @@
+DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
+EBUILD mime-types-9.ebuild 603 BLAKE2B 258d7d0314407b15c6b631b08939a39ceba6044bd47dffba4d5442d2da022536bda2714ef753c195d6e49db87ae8f7c7c77ce6f4be1b167b0b07460fefdac50d SHA512 589a9d7908120387be3bfc042212e98ed09fa6a9c347f63b166afd40f0d31285689a6562ea229b79b34010f095eae8b78b6a68b208928fcbec5ffc2002ba9d90
+MISC metadata.xml 346 BLAKE2B 218632e5ffb174f52dea645949149ddd7af766a3f2906b366f95399a6268055ea3d83e89aab32e1b341e2cb7ffdf21344fddc2d2e0b083c4ed7a5df9cb634dc3 SHA512 65aa65edd1d47b4d6f87120e6685cccbc90c8daedabcac6f9ebfbab562682cc226d7a6f83886f61e38bb3fbfcd6b32ca17725291d6f95939cc1d40dc8bb0173a
diff --git a/app-misc/mime-types/metadata.xml b/app-misc/mime-types/metadata.xml
new file mode 100644
index 000000000000..d0eb5c6228b4
--- /dev/null
+++ b/app-misc/mime-types/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>djc@gentoo.org</email>
+ <name>Dirkjan Ochtman</name>
+</maintainer>
+<maintainer type="project">
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
new file mode 100644
index 000000000000..9367b583533b
--- /dev/null
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Provides /etc/mime.types file"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+ insinto /etc
+ doins mime.types
+}
diff --git a/app-misc/mmv-1.01b_p18 b/app-misc/mmv-1.01b_p18
deleted file mode 100644
index 608480fc664c..000000000000
--- a/app-misc/mmv-1.01b_p18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Move/copy/append/link multiple files according to a set of wildcard patterns
-EAPI=5
-HOMEPAGE=http://packages.debian.org/unstable/utils/mmv
-KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz mirror://debian/pool/main/m/mmv/mmv_1.01b-18.debian.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39c7534a5297f9704648c33624f7c1a6
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
new file mode 100644
index 000000000000..d1fb0d148841
--- /dev/null
+++ b/app-misc/mmv/Manifest
@@ -0,0 +1,4 @@
+DIST mmv_1.01b-18.debian.tar.gz 13463 BLAKE2B db67247bddd38580401d8b1a18aa9ce82af42a994bfe60141066aa08e19a01f35903cc1d8184cb4271ebe2a4a187607a7c5a6a750c121caafdf71fdc0ccb8896 SHA512 3543aff53c67cab00689d4c8b778447c976a7860a569bd51f74534bec8bd3b67b9e12743bd03bc6fda930748abddd12e16f1965686cbce04bd48bf191fc4127b
+DIST mmv_1.01b.orig.tar.gz 25656 BLAKE2B 4e3c7c27831fb5aeeb09461116330a993998da510b32a7ba3b1151c0d14a336eab7cf37bc3ac91720f38fb41258a60488e5d066b152d0c717f5413f8514d9026 SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917
+EBUILD mmv-1.01b_p18.ebuild 1269 BLAKE2B 2c4faa9de91736679bcd6279ae8e1364733ba8da187ac5a3c16c622aebb7f3bdc91dcada98d6eaffc3aace7873f9b838b640ed39fb10a24ad60f7fe9e367da88 SHA512 11931b007cdfc09e01a5ca4478564c36ed2b73e83c267e29db2d788cefc63fd27e8f74dedf2d36aac882791a02b914533bde28748a7d58e7c7ce089912ca4625
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/mmv/metadata.xml b/app-misc/mmv/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/mmv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/mmv/mmv-1.01b_p18.ebuild b/app-misc/mmv/mmv-1.01b_p18.ebuild
new file mode 100644
index 000000000000..b494b21028bb
--- /dev/null
+++ b/app-misc/mmv/mmv-1.01b_p18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DEB_PATCH_VER=${PV#*_p}
+MY_VER=${PV%_p*}
+
+DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns"
+HOMEPAGE="http://packages.debian.org/unstable/utils/mmv"
+SRC_URI="
+ mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
+ mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.debian.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}"/${PN}-${MY_VER}.orig
+
+src_prepare() {
+ epatch "${WORKDIR}"/debian/patches/*.diff
+}
+
+src_compile() {
+ # i wonder how this works on other platforms if CFLAGS from makefile are
+ # overridden, see bug #218082
+ [[ ${CHOST} == *-interix* ]] && append-flags -DIS_SYSV -DHAS_RENAME -DHAS_DIRENT
+ [[ ${CHOST} == *-interix* ]] || append-lfs-flags
+
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin mmv
+ dosym mmv /usr/bin/mcp
+ dosym mmv /usr/bin/mln
+ dosym mmv /usr/bin/mad
+
+ doman mmv.1
+ newman mmv.1 mcp.1
+ newman mmv.1 mln.1
+ newman mmv.1 mad.1
+
+ dodoc ANNOUNCE "${WORKDIR}"/debian/{changelog,control}
+}
diff --git a/app-misc/mosquitto-1.4.14 b/app-misc/mosquitto-1.4.14
deleted file mode 100644
index 992e1bb0692c..000000000000
--- a/app-misc/mosquitto-1.4.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=5
-HOMEPAGE=http://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd websockets
-KEYWORDS=amd64 arm x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.14.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c804c4509530bfc7b875decb550d47a3
diff --git a/app-misc/mosquitto-1.4.14-r1 b/app-misc/mosquitto-1.4.14-r1
deleted file mode 100644
index 13f6aafa98dd..000000000000
--- a/app-misc/mosquitto-1.4.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=6
-HOMEPAGE=http://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd websockets
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.14.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=d1bd263567d77e7baa3207c176c3ca0c
diff --git a/app-misc/mosquitto-1.4.15 b/app-misc/mosquitto-1.4.15
deleted file mode 100644
index 02677713126c..000000000000
--- a/app-misc/mosquitto-1.4.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=6
-HOMEPAGE=http://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd test websockets
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=test? ( bridge )
-SLOT=0
-SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.15.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=80b35e0c35164f8388586fb0ee320a4a
diff --git a/app-misc/mosquitto-1.4.15-r2 b/app-misc/mosquitto-1.4.15-r2
deleted file mode 100644
index 4f3605ae1761..000000000000
--- a/app-misc/mosquitto-1.4.15-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) websockets? ( net-libs/libwebsockets ) virtual/pkgconfig
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=6
-HOMEPAGE=https://mosquitto.org/
-IUSE=bridge examples +persistence +srv ssl tcpd test websockets
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=EPL-1.0
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=test? ( bridge )
-SLOT=0
-SRC_URI=https://mosquitto.org/files/source/mosquitto-1.4.15.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=06d01440237f7fcfe0af237ad4ccd5df
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
new file mode 100644
index 000000000000..b66100fde2a3
--- /dev/null
+++ b/app-misc/mosquitto/Manifest
@@ -0,0 +1,11 @@
+AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
+AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
+AUX mosquitto-1.4.15-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
+AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
+DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
+DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
+EBUILD mosquitto-1.4.14-r1.ebuild 2462 BLAKE2B e747f7751b56d1f93a460985e19555fd7fdb1bf08540eec7ab2107ad8165797de2363f0383eeaab4b2bc5011d830022f63ec5baf73804a1f0492c03a7632de3b SHA512 59f100a47c98636c82f4ca5b4d2edb0c1e6399ef25d95dd62f576f9694b11fef32d01dc58c63d69d5aa4bd119dd467199f3d49d19760be9b8220ff7420749c0c
+EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
+EBUILD mosquitto-1.4.15-r2.ebuild 2463 BLAKE2B 3e6c1a3ab075a62675e3f9158a665f65238c8a35c72bd7e1a4b5517f756907e5769bc4ea46b6f5c1cff2a74f3983caa3945fb6a0df3203d76ae182764d43f9ec SHA512 6cc77d34fd71a288db14c8f2b74ead1602953d8c5c96fba9c6b742fa74ec0c356ded19ff0d0d6436c1f7c8b8bf42c239568c8ed7c59fbf07b2e525dcc47c2b49
+EBUILD mosquitto-1.4.15.ebuild 2366 BLAKE2B 6df167983ebe736631cc55fb47b9487bd456928e17d149653e7f5ec333ab874f41e4371ee882ee16a984fc055146ddb1fe7727ff71f5917fd1e3c0dd50db76f4 SHA512 609584b242bbabca2214fa6027f948ce6c237fe9e6be43acb38625abdf83e5c898c9158244612b5a4201a18e99b0fd78b987b71d54dbbf6a0a62f4a60ce4bb5c
+MISC metadata.xml 656 BLAKE2B 58ecef974e662c6dccf267ba8732116010a3db7679d6ee3e163cd351073a210f0bb06e5098945564f048353caf4ed7fe73d69bc96cce42c56ba298073fe95384 SHA512 2034ecb6ff73024cd905d275da23b27568d897dd616ca70a2485922667a74d4ac1d6df11b0a7a413bc8d595962697959e4cbe13c8934e8b3333c6a4e290d657f
diff --git a/app-misc/mosquitto/files/mosquitto b/app-misc/mosquitto/files/mosquitto
new file mode 100644
index 000000000000..e70a6ab01b3d
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ if [ ! -f /etc/${SVCNAME}/${SVCNAME}.conf ] ; then
+ eerror "No /etc/${SVCNAME}/${SVCNAME}.conf file exists!"
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --exec /usr/sbin/${SVCNAME} --background --make-pidfile --pidfile /var/run/${SVCNAME}.pid -- --config-file /etc/${SVCNAME}/${SVCNAME}.conf
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec /usr/sbin/${SVCNAME} --pidfile /var/run/${SVCNAME}.pid
+ eend $?
+}
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch
new file mode 100644
index 000000000000..12b4fc56bc3c
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.4.10-conditional-tests.patch
@@ -0,0 +1,43 @@
+--- a/test/broker/Makefile 2016-06-02 22:20:22.000000000 +0100
++++ b/test/broker/Makefile 2016-07-08 14:17:33.772666865 +0100
+@@ -63,6 +63,7 @@
+ ./05-clean-session-qos1.py
+
+ 06 :
++ifeq ($(WITH_BRIDGE),yes)
+ ./06-bridge-reconnect-local-out.py
+ ./06-bridge-br2b-disconnect-qos1.py
+ ./06-bridge-br2b-disconnect-qos2.py
+@@ -70,6 +71,7 @@
+ ./06-bridge-b2br-disconnect-qos2.py
+ ./06-bridge-fail-persist-resend-qos1.py
+ ./06-bridge-fail-persist-resend-qos2.py
++endif
+
+ 07 :
+ ./07-will-qos0.py
+@@ -87,10 +89,12 @@
+ ./08-ssl-connect-cert-auth-crl.py
+ ./08-ssl-connect-identity.py
+ ./08-ssl-connect-no-identity.py
++ifeq ($(WITH_BRIDGE),yes)
+ ./08-ssl-bridge.py
+ ./08-tls-psk-pub.py
+ ./08-tls-psk-bridge.py
+ endif
++endif
+
+ 09 :
+ ./09-plugin-auth-unpwd-success.py
+--- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000
++++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
++ifeq ($(WITH_BRIDGE),yes)
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
++endif
+
+
+ reallyclean : clean
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
new file mode 100644
index 000000000000..1642597c5620
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
@@ -0,0 +1,12 @@
+--- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000
++++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
++ifeq ($(WITH_BRIDGE),yes)
+ $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
++endif
+
+
+ reallyclean : clean
diff --git a/app-misc/mosquitto/files/mosquitto.service b/app-misc/mosquitto/files/mosquitto.service
new file mode 100644
index 000000000000..ebdc28e3448a
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mosquitto MQTT Broker daemon
+ConditionPathExists=/etc/mosquitto/mosquitto.conf
+Requires=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
new file mode 100644
index 000000000000..2b05da7a5d48
--- /dev/null
+++ b/app-misc/mosquitto/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ramage.lucas@openmailbox.org</email>
+ <name>Lucas Ramage</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="bridge">Enable bridge support in the MQTT broker.</flag>
+ <flag name="persistence">Store messages and subscriptions to a file.</flag>
+ <flag name="srv">Include SRV lookup support.</flag>
+ <flag name="websockets">Support the WebSocket protocol.</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
new file mode 100644
index 000000000000..96530da48cb2
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd websockets"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ srv? ( net-dns/c-ares )
+ websockets? ( net-libs/libwebsockets )"
+
+pkg_setup() {
+ enewgroup mosquitto
+ enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
+ if use persistence; then
+ sed -i -e "s:^#autosave_interval:autosave_interval:" \
+ -e "s:^#persistence false$:persistence true:" \
+ -e "s:^#persistence_file:persistence_file:" \
+ -e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
+ mosquitto.conf || die
+ fi
+
+ # Remove prestripping
+ sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+ client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+ python_setup
+ python_fix_shebang test
+ eapply_user
+}
+
+src_configure() {
+ LIBDIR=$(get_libdir)
+ makeopts=(
+ "CC=$(tc-getCC)"
+ "LIB_SUFFIX=${LIBDIR:3}"
+ "WITH_BRIDGE=$(usex bridge)"
+ "WITH_PERSISTENCE=$(usex persistence)"
+ "WITH_SRV=$(usex srv)"
+ "WITH_TLS=$(usex ssl)"
+ "WITH_WEBSOCKETS=$(usex websockets)"
+ "WITH_WRAP=$(usex tcpd)"
+ )
+}
+
+src_compile() {
+ emake "${makeopts[@]}"
+}
+
+src_test() {
+ emake "${makeopts[@]}" test
+}
+
+src_install() {
+ emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
+ keepdir /var/lib/mosquitto
+ fowners mosquitto:mosquitto /var/lib/mosquitto
+ dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+ doinitd "${FILESDIR}"/mosquitto
+ insinto /etc/mosquitto
+ doins mosquitto.conf
+ systemd_dounit "${FILESDIR}/mosquitto.service"
+
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ insinto "/usr/share/doc/${PF}/examples"
+ doins -r examples/*
+ fi
+}
+
+pkg_postinst() {
+ elog ""
+ elog "The Python module has been moved out of mosquitto."
+ elog "See http://mosquitto.org/documentation/python/"
+ elog ""
+ elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+ elog ""
+ elog " rc-update add mosquitto default"
+ elog " or"
+ elog " systemctl enable mosquitto"
+}
diff --git a/app-misc/mosquitto/mosquitto-1.4.14.ebuild b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
new file mode 100644
index 000000000000..04008dcbd0bd
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="bridge examples +persistence +srv ssl tcpd websockets"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ srv? ( net-dns/c-ares )
+ websockets? ( net-libs/libwebsockets )"
+
+pkg_setup() {
+ enewgroup mosquitto
+ enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
+ if use persistence; then
+ sed -i -e "s:^#autosave_interval:autosave_interval:" \
+ -e "s:^#persistence false$:persistence true:" \
+ -e "s:^#persistence_file:persistence_file:" \
+ -e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
+ mosquitto.conf || die
+ fi
+
+ # Remove prestripping
+ sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+ client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+ python_setup
+ python_fix_shebang test
+}
+
+src_configure() {
+ LIBDIR=$(get_libdir)
+ makeopts=(
+ "CC=$(tc-getCC)"
+ "LIB_SUFFIX=${LIBDIR:3}"
+ "WITH_BRIDGE=$(usex bridge)"
+ "WITH_PERSISTENCE=$(usex persistence)"
+ "WITH_SRV=$(usex srv)"
+ "WITH_TLS=$(usex ssl)"
+ "WITH_WEBSOCKETS=$(usex websockets)"
+ "WITH_WRAP=$(usex tcpd)"
+ )
+}
+
+src_compile() {
+ emake "${makeopts[@]}"
+}
+
+src_test() {
+ emake "${makeopts[@]}" test
+}
+
+src_install() {
+ emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
+ keepdir /var/lib/mosquitto
+ fowners mosquitto:mosquitto /var/lib/mosquitto
+ dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+ doinitd "${FILESDIR}"/mosquitto
+ insinto /etc/mosquitto
+ doins mosquitto.conf
+ systemd_dounit "${FILESDIR}/mosquitto.service"
+
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ insinto "/usr/share/doc/${PF}/examples"
+ doins -r examples/*
+ fi
+}
+
+pkg_postinst() {
+ elog ""
+ elog "The Python module has been moved out of mosquitto."
+ elog "See http://mosquitto.org/documentation/python/"
+ elog ""
+ elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+ elog ""
+ elog " rc-update add mosquitto default"
+ elog " or"
+ elog " systemctl enable mosquitto"
+}
diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
new file mode 100644
index 000000000000..48165a4db6f3
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ srv? ( net-dns/c-ares )
+ websockets? ( net-libs/libwebsockets )"
+
+PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
+
+_emake() {
+ LIBDIR=$(get_libdir)
+ emake \
+ CC="$(tc-getCC)" \
+ LIB_SUFFIX="${LIBDIR:3}" \
+ WITH_BRIDGE="$(usex bridge)" \
+ WITH_PERSISTENCE="$(usex persistence)" \
+ WITH_SRV="$(usex srv)" \
+ WITH_TLS="$(usex ssl)" \
+ WITH_WEBSOCKETS="$(usex websockets)" \
+ WITH_WRAP="$(usex tcpd)" \
+ "$@"
+}
+
+pkg_setup() {
+ enewgroup mosquitto
+ enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+ default
+ if use persistence; then
+ sed -i -e "/^#autosave_interval/s|^#||" \
+ -e "s|^#persistence false$|persistence true|" \
+ -e "/^#persistence_file/s|^#||" \
+ -e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+ mosquitto.conf || die
+ fi
+
+ # Remove prestripping
+ sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+ client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+ python_setup
+ python_fix_shebang test
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ _emake DESTDIR="${D}" prefix=/usr install
+ keepdir /var/lib/mosquitto
+ fowners mosquitto:mosquitto /var/lib/mosquitto
+ dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+ doinitd "${FILESDIR}"/mosquitto
+ insinto /etc/mosquitto
+ doins mosquitto.conf
+ systemd_dounit "${FILESDIR}/mosquitto.service"
+
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ docinto "/usr/share/doc/${PF}"
+ doins -r examples
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "The Python module has been moved out of mosquitto."
+ elog "See https://mosquitto.org/documentation/python/"
+ else
+ elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+ elog ""
+ elog " rc-update add mosquitto default"
+ elog " or"
+ elog " systemctl enable mosquitto"
+ fi
+}
diff --git a/app-misc/mosquitto/mosquitto-1.4.15.ebuild b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
new file mode 100644
index 000000000000..65dffc2f3f19
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ srv? ( net-dns/c-ares )
+ websockets? ( net-libs/libwebsockets )"
+
+_emake() {
+ LIBDIR=$(get_libdir)
+ emake \
+ CC="$(tc-getCC)" \
+ LIB_SUFFIX="${LIBDIR:3}" \
+ WITH_BRIDGE="$(usex bridge)" \
+ WITH_PERSISTENCE="$(usex persistence)" \
+ WITH_SRV="$(usex srv)" \
+ WITH_TLS="$(usex ssl)" \
+ WITH_WEBSOCKETS="$(usex websockets)" \
+ WITH_WRAP="$(usex tcpd)" \
+ "$@"
+}
+
+pkg_setup() {
+ enewgroup mosquitto
+ enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+ if use persistence; then
+ sed -i -e "/^#autosave_interval/s|^#||" \
+ -e "s|^#persistence false$|persistence true|" \
+ -e "/^#persistence_file/s|^#||" \
+ -e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+ mosquitto.conf || die
+ fi
+
+ # Remove prestripping
+ sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+ client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+ python_setup
+ python_fix_shebang test
+ eapply_user
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ _emake DESTDIR="${D}" prefix=/usr install
+ keepdir /var/lib/mosquitto
+ fowners mosquitto:mosquitto /var/lib/mosquitto
+ dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+ doinitd "${FILESDIR}"/mosquitto
+ insinto /etc/mosquitto
+ doins mosquitto.conf
+ systemd_dounit "${FILESDIR}/mosquitto.service"
+
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ docinto "/usr/share/doc/${PF}"
+ doins -r examples
+ fi
+}
+
+pkg_postinst() {
+ elog ""
+ elog "The Python module has been moved out of mosquitto."
+ elog "See http://mosquitto.org/documentation/python/"
+ elog ""
+ elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+ elog ""
+ elog " rc-update add mosquitto default"
+ elog " or"
+ elog " systemctl enable mosquitto"
+}
diff --git a/app-misc/mouseremote-0.90-r2 b/app-misc/mouseremote-0.90-r2
deleted file mode 100644
index 6f9dc7628e1b..000000000000
--- a/app-misc/mouseremote-0.90-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/perl-Time-HiRes
-DESCRIPTION=X10 MouseRemote
-EAPI=6
-HOMEPAGE=http://www4.pair.com/gribnif/ha/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a74b2e868de35a20d7b5cd4c91956c8d
diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
new file mode 100644
index 000000000000..9bca62d34f95
--- /dev/null
+++ b/app-misc/mouseremote/Manifest
@@ -0,0 +1,8 @@
+AUX mouseremote-0.90-fix-warnings.diff 631 BLAKE2B ca0d5dfc9cdcb51a9a7426be220113a21aa12d2100503632cc6c7e56cee58174b2c81bc885abd152a67dbd7cd5fd35969434e429a6e83c128b20bfda77246733 SHA512 203b8df256510e98e5f46365c308b12c80fb7c92f164663ace8627e1ff9ae0e47c69912fe562e92466f289c0827d46f295b776ce43859d94b272ff6f8cf35a6f
+AUX mouseremote-0.90-gentoo.diff 1130 BLAKE2B f219bba9912a620a02a91881e6bce1d0558dfec032d1b926b4be7439b25a224a8655de2f054230a0705fa1a5777d1e997dde7f9c07f5d542937519e3cf178921 SHA512 607483c622f3347d3fad6de2f8c9eacd3a4f389baaa2bed94e72a6d5db65006c67231b92962ad08b1756983fe6af7d599b93bba880558867a032840942654e6b
+AUX mouseremote-0.90-makefile.diff 507 BLAKE2B c93decf07db9ad8f25c9ee8902b1e9841fe29e10c26cb1dc0c49736a3755edc25cd8545190b25aafc1b36d903e381f24e01fbf1a80efd04983f815883cdba09e SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0
+AUX mouseremote.conf 461 BLAKE2B 323401e37e6824b581ac63c947f5551b96bea35b9901310a039f86754ab35648b09b49fe5a01ce80be518fc6841b424d65c5ae5d1e64c8864035ca080183325a SHA512 b1e99866c0aec8036ea6bbd0e831afca79a5530ab1635fa1f6f407f7c49df5aa1df9c14e7e864fd6503063c05fc882792f6da4785e694865e4ef90d459a8e1f4
+AUX mouseremote.start 598 BLAKE2B 758b559aacbf1c3af63286cbe994087fd02e7c44d272ba1542d78b388baa7346240a5e0e66dada484ed877645e56a786ed6b7eaa4411893a66d88ea0e80200ea SHA512 9cbcd5037057498ccbe8dc4a16308f7390112389440cbbcc4675b2750bfeeca2c54b1fd3da5d91efb3f2e9bcd453b125c526c3412a1e30fa56a937183aca7abe
+DIST MouseRemote.tar.gz 41752 BLAKE2B 90e80bf4d6584db567e035c293460bbf4d30592fa6c25a6cf97769f4e9879b935ef597d8073f429e630e3fb4947f9e8cbdff7450cb5c3b64d0f482e576e2905d SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483
+EBUILD mouseremote-0.90-r2.ebuild 1945 BLAKE2B 7bd0b8a6b5bdfc7f8e1485a1f0dd1d28ce83d832175460321e4bd7527824bce590d846d8c440d7e588d336871bbc5f981e74e8b181de82a0dbcd5c69d8e3ee52 SHA512 0463baf4ac6a0d07a85a15ea46b04fd08a3660d23ee5a027e924498063f0b22bddb3c7444ece5667f4a1991d7499509474b774a2992282185b5091ded5fe3814
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
new file mode 100644
index 000000000000..63447b9bc4ce
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
@@ -0,0 +1,23 @@
+diff -ur MultiMouse.orig/daemon.c MultiMouse/daemon.c
+--- MultiMouse.orig/daemon.c 1999-10-09 20:08:58.000000000 +0000
++++ MultiMouse/daemon.c 2016-04-27 22:36:59.133322312 +0000
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib.h>
+
+ #include "mumse.h"
+
+diff -ur MultiMouse.orig/main.c MultiMouse/main.c
+--- MultiMouse.orig/main.c 1999-10-03 17:40:23.000000000 +0000
++++ MultiMouse/main.c 2016-04-27 22:34:58.346647395 +0000
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <string.h>
+
+ #include "mumse.h"
+
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
new file mode 100644
index 000000000000..d86902e37ed5
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
@@ -0,0 +1,66 @@
+diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
+--- MouseRemote.ORG/client/MouseRemote.conf Sat Oct 9 21:03:42 1999
++++ MouseRemote/client/MouseRemote.conf Sat May 4 16:04:43 2002
+@@ -61,3 +61,35 @@
+
+ # Definitions for the DVD device
+ [DVD]
++Power
++ChUp
++ChDown
++Mute
++VolUp
++VolDown
++Play
++Stop
++TxtRes
++Rew
++FF
++0
++1
++2
++3
++4
++5
++6
++7
++8
++9
++Ent
++Pause
++Last
++Disp
++AB
++Shift
++Guide
++Select
++TxtOff
++TxtTrns
++Rec
+diff -Naur MouseRemote.ORG/client/MouseRemoteKeys.pl MouseRemote/client/MouseRemoteKeys.pl
+--- MouseRemote.ORG/client/MouseRemoteKeys.pl Sun Oct 10 00:09:42 1999
++++ MouseRemote/client/MouseRemoteKeys.pl Sat May 4 15:58:58 2002
+@@ -11,6 +11,7 @@
+ play => 0x0d,
+ stop => 0x0e,
+ power => 0x0f,
++ txtres => 0x1b,
+ rew => 0x1c,
+ ff => 0x1d,
+ 0 => 0x40,
+@@ -31,11 +32,13 @@
+ 'shift' => 0x6b,
+ guide => 0x6d,
+ 'select' => 0x93,
++ txtoff => 0x9b,
++ txttrns => 0xeb,
+ rec => 0xff,
+
+ pc => 0x2b,
+- phone => 0x4b,
++ phone => 0x4b, # Marked as F2 on my model
+ web => 0x8b,
+ cd => 0xab,
+- dvd => 0xcb,
++ dvd => 0xcb, # Marked as F1 on my model
+ );
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff b/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
new file mode 100644
index 000000000000..2f6fb8a81f15
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
@@ -0,0 +1,20 @@
+--- MultiMouse/Makefile 1997-08-21 08:52:56.000000000 -0400
++++ MultiMouse/Makefile 2010-08-13 00:05:47.000000000 -0400
+@@ -20,14 +20,13 @@
+ -DMOUSE_FIFO=\"$(FIFO)\"\
+ -DLOCKDIR=\"$(LOCKDIR)\"\
+ -DMAX_MICE=$(MICE)
+-CFLAGS= $(OPTS)\
+- -O2 # -DDEBUG
+-LDLAGS= -O2
++
++OUTPUT_OPTION= $(OPTS) -o $@
+
+ all: $(TARGET)
+
+ multimoused: $(OBJS)
+- $(CC) -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS)
+
+ multimouse.1 multimoused.8 multimouse: Makefile
+ sed -e 's|%LOCKDIR%|$(LOCKDIR)|' -e 's|%BINDIR%|$(BINDIR)|'\
diff --git a/app-misc/mouseremote/files/mouseremote.conf b/app-misc/mouseremote/files/mouseremote.conf
new file mode 100644
index 000000000000..3ca7396177bc
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote.conf
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/mouseremote
+
+# Configure the type of mouseremote you have and the device it is connected to
+
+# If your device is attached to the regular psaux port then set DRV to X10
+# If your device is attached to a serial port then set DRV to SX10
+#DRV=SX10
+
+# Set this to the port on which your mouseremote is attached
+#DEV=/dev/ttyS1
diff --git a/app-misc/mouseremote/files/mouseremote.start b/app-misc/mouseremote/files/mouseremote.start
new file mode 100644
index 000000000000..e149dd8eb70c
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote.start
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use modules logger
+ before xdm
+}
+
+checkconfig() {
+ [ -z "$DEV" ] || [ -z "$DRV" ] || return 0
+ eerror "You need to setup DEV and DRV in /etc/conf.d/mouseremote first"
+ return 1
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting X10 MouseRemote Server"
+ /usr/sbin/multimoused -${DRV} ${DEV} 2> /dev/null
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping X10 MouseRemote Server"
+ kill $(cat /var/lock/MultiMouse.pid)
+ eend ${?} "Failed to stop MouseRemote Server"
+}
diff --git a/app-misc/mouseremote/metadata.xml b/app-misc/mouseremote/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/mouseremote/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/mouseremote/mouseremote-0.90-r2.ebuild b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
new file mode 100644
index 000000000000..ddddb1fbdd1e
--- /dev/null
+++ b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="X10 MouseRemote"
+HOMEPAGE="http://www4.pair.com/gribnif/ha/"
+SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/perl-Time-HiRes"
+
+S="${WORKDIR}/MouseRemote"
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}"/${P}-makefile.diff
+ eapply "${FILESDIR}"/${P}-gentoo.diff
+ eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
+
+ eapply_user
+}
+
+src_compile() {
+ cd MultiMouse && emake \
+ CC=$(tc-getCC) \
+ PREFIX=/usr \
+ LOCKDIR=/var/lock \
+ JMANDIR=/usr/share/man/ja_JP.ujis
+}
+
+src_install() {
+ dobin MultiMouse/multimouse
+ dosbin MultiMouse/multimoused
+
+ dodoc README MultiMouse/README.jis MultiMouse/README.newstuff
+ newdoc MultiMouse/README README.MultiMouse
+ newdoc client/MouseRemote.conf MouseRemote.conf.dist
+ newdoc client/MouseRemote.pl MouseRemote.pl.dist
+ newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist
+
+ newinitd "${FILESDIR}"/mouseremote.start mouseremote
+ newconfd "${FILESDIR}"/mouseremote.conf mouseremote
+}
+
+pkg_postinst() {
+ [ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
+ [ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
+
+ elog "To use the mouse function in X, add the following to your XF86Config"
+ elog "Section \"InputDevice\""
+ elog " Identifier \"MouseREM\""
+ elog " Driver \"mouse\""
+ elog " Option \"Protocol\" \"MouseSystems\""
+ elog " Option \"Device\" \"/dev/mumse\""
+ elog "EndSection"
+ elog
+ elog "Don't forget to add the new device to the section \"ServerLayout\""
+ elog "like: InputDevice \"MouseREM\" \"SendCoreEvents\""
+ elog
+ elog "Enable the daemon with \"rc-update add mouseremote default\"."
+ elog
+ elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+ elog
+ elog "See /usr/share/doc/${PF} on how to configure the buttons."
+}
diff --git a/app-misc/mswinurl_launcher-1.0 b/app-misc/mswinurl_launcher-1.0
deleted file mode 100644
index 4374dcddf35f..000000000000
--- a/app-misc/mswinurl_launcher-1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils
-DESCRIPTION=Launcher and desktop association for MS Windows *.URL (text/x-uri) files
-EAPI=6
-HOMEPAGE=https://gist.github.com/endolith/77635
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://gist.github.com/endolith/77635/archive/a46707715aa2e112d2ea5ec26771030ff5e7eb64.tar.gz -> mswinurl_launcher-1.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5054b87e5d98b679efd2275352de7d0f
diff --git a/app-misc/mswinurl_launcher/Manifest b/app-misc/mswinurl_launcher/Manifest
new file mode 100644
index 000000000000..f45ac62df47c
--- /dev/null
+++ b/app-misc/mswinurl_launcher/Manifest
@@ -0,0 +1,3 @@
+DIST mswinurl_launcher-1.0.tar.gz 1289 BLAKE2B b705fac43259c6b80d1d1182dd82165fccb2e41c01874021712db09d50f26d1bdfd65e9854a8d184dae7a25d778880f66825f5b4df3596954d1481c42675216d SHA512 60435b78dc88ff3e6f780ef42a975eaedc2f515168ba1c6c3fc8b38f87ea5ad4d70d975825877233bae1c5f9c6a521d1c12d301683c9e3e705d18c6c26ce4f86
+EBUILD mswinurl_launcher-1.0.ebuild 1262 BLAKE2B fac9adc2187c8ae38de8c6e8357a358dc3fba424d30683226baa3e422006e14a02a8b0fad1291c23c3ef827cc0e1a0a2f9c8c816f4e064e0fb5cf2a4c818d67e SHA512 c02406dd4dda8e19de8fa8eeec5788aff4b225197be20333a011347ef4fcae305ceddb0cef91892c769fd36126ac6a93f54d91138f4fb49561adbf2221317466
+MISC metadata.xml 424 BLAKE2B 9e50878d39a0109d5094ed04786e7033053f4ae58717052baba00d2de6a1a0091be92609283896414b61be3c05419507be804f839674cde5588cba9c4317ee55 SHA512 1b140f4cee7cea8c31036eb2232f1c8a859b1ee6e783b47be1c091ff0b5a8c8498470e691e977abb6eebaebf61def9dd4a8836686a573be42608101e07983f18
diff --git a/app-misc/mswinurl_launcher/metadata.xml b/app-misc/mswinurl_launcher/metadata.xml
new file mode 100644
index 000000000000..c57658328f07
--- /dev/null
+++ b/app-misc/mswinurl_launcher/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>axs@gentoo.org</email>
+</maintainer>
+<longdescription>
+This is a simple launcher script and .desktop entry to associate MS Windows *.URL (text/x-uri)
+files on linux DEs so that they will open in the configured default web browser.</longdescription>
+</pkgmetadata>
diff --git a/app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild b/app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild
new file mode 100644
index 000000000000..2faf9f6a54d6
--- /dev/null
+++ b/app-misc/mswinurl_launcher/mswinurl_launcher-1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime python-r1
+
+GIST_STRING="77635-a46707715aa2e112d2ea5ec26771030ff5e7eb64"
+
+DESCRIPTION="Launcher and desktop association for MS Windows *.URL (text/x-uri) files"
+HOMEPAGE="https://gist.github.com/endolith/77635"
+SRC_URI="https://gist.github.com/endolith/${GIST_STRING/-//archive/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-util/desktop-file-utils"
+
+S="${WORKDIR}"/$GIST_STRING
+
+src_install() {
+ dobin ${PN}.py
+ python_replicate_script "${ED%/}"/usr/bin/${PN}.py
+
+ cat <<DESKTOP_EOF >"${T}"/${PN}.desktop
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=MS Windows URL file launcher
+Comment=Python script to parse and launch .url files (html links) from MS Windows
+NoDisplay=true
+Terminal=false
+TryExec=mswinurl_launcher.py
+Exec=mswinurl_launcher.py %F
+Icon=text-html
+MimeType=text/x-uri;
+DESKTOP_EOF
+ domenu "${T}"/${PN}.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-misc/mtail-1.1.1-r3 b/app-misc/mtail-1.1.1-r3
deleted file mode 100644
index 86d9df9fe56e..000000000000
--- a/app-misc/mtail-1.1.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Tail workalike, that performs output colourising
-EAPI=5
-HOMEPAGE=http://matt.immute.net/src/mtail/
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=HPND
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://matt.immute.net/src/mtail/mtail-1.1.1.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce603b14e838f3fdd1211eea15daf5c0
diff --git a/app-misc/mtail/Manifest b/app-misc/mtail/Manifest
new file mode 100644
index 000000000000..cc50fe8539c6
--- /dev/null
+++ b/app-misc/mtail/Manifest
@@ -0,0 +1,5 @@
+AUX mtail-1.1.1-remove-blanks.patch 1850 BLAKE2B dfaffe1b7dbbe54c1db30a7e0ce9c3c50f51397d5c8dc1e5a64d32441907593e58e65ca84d5697043509342a99d86d628f131cfbe7d0617a207b30afc0b177bb SHA512 64720ec0253dfc88e58b0392bcb4c1eb2f367547d034f60722dc19b0093d5da3d40e847c69203080cd19126ab67f7fad3c2dccc7e6cc74f56c1d50f3dee805a4
+DIST mtail-1.1.1.tgz 9124 BLAKE2B 804ec168eb5dc5408ffd91fc80a6f080b0575dfb58bc667a3ff3d657cea955a4a697ff3f99470e86e59387e0bb2275cd2a0a6e5ee97bc88f28df4424a4c012b8 SHA512 987816ce5d12996192c881be1ac5a28c3457757e981ab35e657fb226c3980a22091c9fc85f68c13eb1c01939e08e492814b6a03c9b1f4f4bc1878c4f13ec8a0e
+DIST mtailrc-syslog.sample 1785 BLAKE2B d060e9baf750505a0908bb18533aad72675962be98875e9f1fed3c734a0339589122ebe2774cc585b05dfde61d8877e05a42184c966050e245bb57ed2dfe500b SHA512 d6bbaafa7c599f443c788697087ebef69a8e279b0715fa4e5b770531cbd254a646014fa98e5e5d444c48d23974201d36a856b34507a91e1b6abbb423f7015c75
+EBUILD mtail-1.1.1-r3.ebuild 774 BLAKE2B d0db274c93f5d5b29ba4364da797bcbc6c84e4f1e8d9cb383333b4b9690c22c4bdc82464f618f663aceb1a633d03a7df75d01f563fc72ba9b50838b6403c5bd5 SHA512 71ac79bf2bdb32e2a2f3111797c261053fd2a11211376bc7ed554e49bc7b6582a727f240af1565884949aaacf570da623694ecedf68e3ae5e93024e8befd39d0
+MISC metadata.xml 642 BLAKE2B 405817cdcf7d643b775f88848ad91930dcf712d65f5c53582ac41656f7d92095bed83add109070888134c074118c54d7ff79359a20d97d0e1459095923e12185 SHA512 7de4bfd79c4dbd929950e191faf4ff6ab90426a0f604fddbdcbaf65d21d21d9a5ec7fb382dc95751ccda8e463bd189dbc07b4d29d92c9dab90e7eb955ace8e19
diff --git a/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch b/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch
new file mode 100644
index 000000000000..9645e263deda
--- /dev/null
+++ b/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch
@@ -0,0 +1,52 @@
+--- mtail.orig 2003-11-07 19:02:34.000000000 +0000
++++ mtail 2003-11-07 19:19:18.000000000 +0000
+@@ -46,6 +46,7 @@
+ verbose = 0
+ silent = 0
+ active = 0
++remove_blanks = 0
+
+ # sets up the interrupt handler, calls processargs(), sets up and starts the
+ # tailers.
+@@ -119,6 +120,8 @@
+ if line[len(line)-1] == '\n':
+ line = line[:len(line)-1]
+ line = filter(line)
++ if remove_blanks and not line:
++ continue
+ lock.acquire()
+ try:
+ if (multiple or verbose) and (not silent) \
+@@ -138,12 +141,14 @@
+ global verbose
+ global silent
+ global config_file
++ global remove_blanks
+ filenames = []
+ lines = None
+ follow = 0
+ try:
+ opts, pargs = getopt.getopt(sys.argv[1:], 'fn:?hvq', ["follow",
+- "lines=", "help", "verbose", "quiet", "silent", "config="])
++ "lines=", "help", "verbose", "quiet", "silent", "config=",
++ "remove-blanks"])
+ except getopt.error:
+ print 'unrecognized option!'
+ print
+@@ -163,6 +168,8 @@
+ silent = 1
+ elif opt[0] in ['--config']:
+ config_file = opt[1]
++ elif opt[0] in ['--remove-blanks']:
++ remove_blanks = 1
+ if lines == None:
+ lines = 10
+ for filename in pargs:
+@@ -186,6 +193,7 @@
+ print ' -v, --verbose always output headers giving file names'
+ print ' -q, --quiet, --silent never output headers giving file names'
+ print ' --config=FILE use config file FILE instead of ~/.mtailrc'
++ print ' --remove-blanks do not display blank lines'
+ print
+ print 'with more than one filename, mtail will precede each chunk from'
+ print 'each with a header giving the file name. if no filenames are given'
diff --git a/app-misc/mtail/metadata.xml b/app-misc/mtail/metadata.xml
new file mode 100644
index 000000000000..1215b29430c5
--- /dev/null
+++ b/app-misc/mtail/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ mtail is a small tail workalike that performs output coloring using
+ ansi escape sequences (although the sequences are overridable, so you
+ could cause it to output something else, e.g. html font tags, if you
+ really wanted to). mtail is written in python, is fairly small, and
+ should be relatively platform-independent.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/mtail/mtail-1.1.1-r3.ebuild b/app-misc/mtail/mtail-1.1.1-r3.ebuild
new file mode 100644
index 000000000000..1ab1926f586f
--- /dev/null
+++ b/app-misc/mtail/mtail-1.1.1-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Tail workalike, that performs output colourising"
+HOMEPAGE="http://matt.immute.net/src/mtail/"
+SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
+ http://matt.immute.net/src/mtail/mtailrc-syslog.sample"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-remove-blanks.patch
+ python_fix_shebang .
+}
+
+src_install() {
+ dobin "${PN}"
+ dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample || die
+}
diff --git a/app-misc/muttprint-0.73-r4 b/app-misc/muttprint-0.73-r4
deleted file mode 100644
index d6a19eda58c9..000000000000
--- a/app-misc/muttprint-0.73-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl virtual/latex-base dev-texlive/texlive-fontsextra doc? ( app-text/dvipsk app-text/docbook-sgml-utils[jadetex] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Script for pretty printing of your mails
-EAPI=5
-HOMEPAGE=http://muttprint.sourceforge.net
-IUSE=doc
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/TimeDate dev-perl/Text-Iconv virtual/latex-base dev-texlive/texlive-latexextra
-SLOT=0
-SRC_URI=mirror://sourceforge/muttprint/muttprint-0.73.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5ae967c200e31aa9dc59f6f83e4596d
diff --git a/app-misc/muttprint/Manifest b/app-misc/muttprint/Manifest
new file mode 100644
index 000000000000..285bd7977e2d
--- /dev/null
+++ b/app-misc/muttprint/Manifest
@@ -0,0 +1,7 @@
+AUX muttprint-0.73-fix-number-of-pages.patch 437 BLAKE2B d6209d3c1d357e6e82c43021633138e0e245b6c33d52c2dba81d35aa9f2b1dc45642b6d2d2aeade89f15774b018b9ed1d843f9af74f4ec4c0cd3a3633c845037 SHA512 f19944d7969d9e180e86b6558b4255cfcb12dea01f4cd042682381d6dc0949e79eed439ba4daf62a41f53a2b5ed76f8f2d72c802bed879f26a2d2fa5cf054449
+AUX muttprint-0.73-manuals.patch 5842 BLAKE2B 4c92a90f47692193dfb27a3506fbd8ff7c4291b9305e262abb20375993648a22481c6a36d75f5d0d5658c298838cd9715b7973b8b41959af7518043d77bd15b2 SHA512 7f9be903e004ab2e567c7af0a0a10963fe716377d82faf2c5c58edb7a80de363b74cd4ccb70886bb58a28e10a1dd476f41cc372d921cbb9a5f91b19fb3a8274f
+AUX muttprint-0.73-pod-encoding.patch 1305 BLAKE2B 4a53284c3531cf71e9a86b6de10f22aafbdd3731306e446175f268503d1fce68a7bfa43c7af3ac0810868f58688f081b5b3388ec4bc808fccfe781c61fbff86c SHA512 227188f17004b3c713bf81c165154e834a18fae9f3e0a461e4e5e267802ab4259556c51aecf00d62d8027b236a6490cd40d6dbcf55afcfde31e09771efe21b95
+AUX muttprint-0.73-warning.patch 404 BLAKE2B 23f0dbcae883aecbe2f9a26567ca432309e3345a8791930ea7c961c71d7fa452ba2b810715dba56825c972be0b65503c9351a2c3a077eebc8f460cb99bca0fea SHA512 4f39fb455c0f99a68b2c004556377c5c385ecf136ae5a317fc1418497bfa28d0965e8b4572897a74da651b75c17cbebe0e12cb37950f8a45cb3b2c4205f65bd5
+DIST muttprint-0.73.tar.gz 361268 BLAKE2B 0d7a84056df8550368783acec52693dbb68f5be547394cbba8701619ab7e73ce69d68f2d531cfa45b56321db89565d5be4e7b72e0c58bfac977c3143ca7b895f SHA512 607bdbee769e6d3a954979f15f017875a70078462bdbd747ff65dc3ac61fda3a0c32b261430faab8e457d6781b03d9f266ae2d21cdbdd058a7635ba9ddd27834
+EBUILD muttprint-0.73-r4.ebuild 1749 BLAKE2B 7c6777010a6f30df0a00822f7633fac2753386de478b902be59573ccb32b225cba7e15621f9f6f27838322d101673ca367ab2b5ceb5c88cadb0f835fda60ca5e SHA512 9cc56828a72af4684403853f88dd28c59d78173135500f4d52e8009aa9d49f81382db6bf73b5f569c71ccb0e655b7ac05fa4b9070610ebe3907dfdf54b61bd9e
+MISC metadata.xml 553 BLAKE2B b8bb28840ef76e2df2d70d3315c16abf01a49eb6901bc407fec2ac35cebedd86aee15bc40b704689adad9742a8313f2068ff1acbc5d5721c04c48917ec3500ab SHA512 48239b719aa371cfaee986200e9d19c5950824c6f760c2cceec4df741fe19e2cb143e3e93bbb0fe3aa5ba9a65690d312d37c6819d2ef55a07d0c89880b9b3f0a
diff --git a/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch b/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch
new file mode 100644
index 000000000000..0e7a4b4f94ff
--- /dev/null
+++ b/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/muttprint b/muttprint
+--- a/muttprint 2016-09-23 10:03:48.870030157 +0200
++++ b/muttprint 2016-09-23 10:08:39.310036004 +0200
+@@ -1635,7 +1635,7 @@
+ open (AUX, "$auxfile") or fatalError "Could not open $auxfile:\n$!";
+
+ while (<AUX>) {
+- ($numberOfPages) = /\\newlabel{LastPage}{{}{(\d+)}}/;
++ ($numberOfPages) = /\\newlabel\{LastPage}\{\{}\{(\d+)}}/;
+ }
+
+ close AUX or fatalError "Could not close $auxfile:\n$!";
diff --git a/app-misc/muttprint/files/muttprint-0.73-manuals.patch b/app-misc/muttprint/files/muttprint-0.73-manuals.patch
new file mode 100644
index 000000000000..57dd12dfa74f
--- /dev/null
+++ b/app-misc/muttprint/files/muttprint-0.73-manuals.patch
@@ -0,0 +1,140 @@
+diff -u -r a/doc/manual/en/manual-en.sgml b/doc/manual/en/manual-en.sgml
+--- a/doc/manual/en/manual-en.sgml 2005-05-16 14:38:51.000000000 +0200
++++ b/doc/manual/en/manual-en.sgml 2011-11-27 23:45:50.970890374 +0100
+@@ -191,6 +191,7 @@
+ <para>As mentioned above, there must be a small C program compiled. If you use Perl
+ 5.8 and/or Linux, you could skip this step. For this, just execute
+
++ </para>
+ <para>
+ <prompt>$ </prompt>
+ <userinput>make</userinput>
+@@ -278,7 +279,7 @@
+
+ <para>You have to add or change following line in the file
+ <Filename>$HOME/.muttrc</Filename> or system wide in
+- <FileName>##SYSCONFDIR##/Muttrc</FileName>:</para>
++ <FileName>/etc/Muttrc</FileName>:</para>
+
+ <ProgramListing>set print_command="muttprint"</ProgramListing>
+
+@@ -316,7 +317,7 @@
+ </ProgramListing>
+
+ <para>You'll find more information in the documentation of Mutt
+- (<Filename>##DOCDIR##/mutt/manual.txt(.gz)</Filename>).</para>
++ (<Filename>/usr/share/doc/muttprint/mutt/manual.txt(.gz)</Filename>).</para>
+
+ </sect3>
+
+@@ -345,7 +346,7 @@
+ <para>In the dialogue <GUImenu>Misc</GUImenu>, <GUImenuItem>Config
+ Misc</GUImenuItem> you have to do an entry in <GUIlabel>Print
+ Command</GUIlabel>:
+- <literal>##BINDIR##/muttprint -f $f</literal>.</para>
++ <literal>/usr/bin/muttprint -f $f</literal>.</para>
+
+
+ <Note>
+@@ -393,7 +394,7 @@
+ <para>You find the code in <filename>README.Gnus</filename> and I
+ would like to refer to this file in this manual. If you use
+ packages for the installation you should find this file in the
+- <filename>##DOCDIR##/muttprint/</filename>
++ <filename>/usr/share/doc/muttprint/muttprint/</filename>
+ directory.</para>
+ </sect3>
+
+@@ -445,7 +446,7 @@
+
+ <para>Some things could be configured in Muttprint. This is permanently
+ done in the configuration files <filename>$HOME/.muttprintrc</filename>
+- (only for the current user) or <filename>##SYSCONFDIR##/Muttprintrc</filename>
++ (only for the current user) or <filename>/etc/Muttprintrc</filename>
+ (global for all users). User settings override global settings.</para>
+
+ <para>You can also specify an additional configuration file with the
+@@ -466,7 +467,7 @@
+ <para>An example for a configuration file is distributed with
+ Muttprint (<filename>sample-muttprintrc</filename>). If you've
+ installed a RPM or Debian package, you'll find it in
+- <filename>##DOCDIR##/muttprint/</filename>.</para>
++ <filename>/usr/share/doc/muttprint/muttprint/</filename>.</para>
+
+ <para>An example for a correct assignment:</para>
+
+@@ -550,7 +551,7 @@
+
+ <para>Additionally, Muttprint comes with some example pictures that
+ are already converted into the EPS format. After the installation,
+- you'll find this in <filename>##SHAREDIR##/muttprint</filename>.</para>
++ you'll find this in <filename>/usr/share/muttprint</filename>.</para>
+
+ <para>If the printing of the graphic should turned off,
+ set <literal>PENGUIN</literal> to the value <literal>off</literal>.
+@@ -917,7 +918,7 @@
+ value. Possible are only <literal>A4</literal> and
+ <literal>letter</literal>.</para>
+
+- <para>If there exists a file <filename>##SYSCONFDIR##/papersize</filename> as
++ <para>If there exists a file <filename>/etc/papersize</filename> as
+ usually on Debian systems, it is evaluated, too. Own settings overwrite
+ this system settings.</para>
+
+@@ -1023,7 +1024,7 @@
+ <para>For this, you can assign the variable <literal>BACKGROUND</literal>
+ the value <literal>on</literal>. In the debug mode (see <xref
+ linkend="debug">) this option has no effect.</para>
+-
++ </sect3>
+ <sect3 id="debug">
+ <title>Error messages</title>
+
+diff -u -r a/doc/manual/it/manual-it.sgml b/doc/manual/it/manual-it.sgml
+--- a/doc/manual/it/manual-it.sgml 2005-05-16 14:38:51.000000000 +0200
++++ b/doc/manual/it/manual-it.sgml 2011-11-27 23:45:33.378110313 +0100
+@@ -264,7 +264,7 @@
+
+ <para>Puoi trovere maggiori informazioni nelle documentazione di
+ Mutt
+- (<Filename>##DOCDIR##/mutt/manual.txt(.gz)</Filename>).</para>
++ (<Filename>/usr/share/doc/muttprint/mutt/manual.txt(.gz)</Filename>).</para>
+
+ </sect3>
+
+@@ -296,7 +296,7 @@
+ <para>Nel dialogo <GUImenu>Misc</GUImenu>, <GUImenuItem>Config
+ Misc</GUImenuItem> devi settare una entry in <GUIlabel>Print
+ Command</GUIlabel>:
+- <literal>##BINDIR##/muttprint -f $f</literal>.</para>
++ <literal>/usr/bin/muttprint -f $f</literal>.</para>
+
+
+ <Note>
+@@ -345,7 +345,7 @@
+ <para>Poui trovare il codice in <filename>README.Gnus</filename> e
+ preferirei far riferimento a questo file per questo manuale.
+ Se usi i pacchetti per l'installazione dovresti trovare
+- questo file in <filename>##DOCDIR##/muttprint/</filename>.</para>
++ questo file in <filename>/usr/share/doc/muttprint/muttprint/</filename>.</para>
+ </sect3>
+
+ <sect3>
+@@ -874,7 +874,7 @@
+ Sono possibili solo <literal>A4</literal> e <literal>letter</literal>.
+ </para>
+
+- <para>Se è presente un file <filename>##SYSCONFDIR##/papersize</filename> come
++ <para>Se è presente un file <filename>/etc/papersize</filename> come
+ di soliuto nei sistemi Debian, viene anch'esso considerato.
+ Le proprie impostazione prevarranno su quelle di sistema.</para>
+
+@@ -1079,7 +1079,7 @@
+ <row>
+ <entry>ISO-8859-4</entry>
+ <entry><literal>latin4</literal></entry>
+- <entry>Lingue Europa sud-orientale ed altre lingue/entry>
++ <entry>Lingue Europa sud-orientale ed altre lingue</entry>
+ </row>
+ <row>
+ <entry>ISO-8859-9</entry>
diff --git a/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch
new file mode 100644
index 000000000000..1a939582c1bf
--- /dev/null
+++ b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/doc/manpages/de/muttprint.pod b/doc/manpages/de/muttprint.pod
+--- a/doc/manpages/de/muttprint.pod 2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/de/muttprint.pod 2014-12-19 23:17:31.939783684 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NAME
+
+ muttprint - schöner Ausdruck von Mails mit Mutt
+diff -Nuar a/doc/manpages/en/muttprint.pod b/doc/manpages/en/muttprint.pod
+--- a/doc/manpages/en/muttprint.pod 2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/en/muttprint.pod 2014-12-19 23:17:15.219783778 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NAME
+
+ muttprint - pretty printing of mails with Mutt
+diff -Nuar a/doc/manpages/es/muttprint.pod b/doc/manpages/es/muttprint.pod
+--- a/doc/manpages/es/muttprint.pod 2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/es/muttprint.pod 2014-12-19 23:17:25.029783723 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NOMBRE
+
+ muttprint - impresión elegante de mensajes de correo con Mutt
+diff -Nuar a/doc/manpages/it/muttprint.pod b/doc/manpages/it/muttprint.pod
+--- a/doc/manpages/it/muttprint.pod 2006-05-06 09:13:46.000000000 +0200
++++ b/doc/manpages/it/muttprint.pod 2014-12-19 23:17:39.779783640 +0100
+@@ -1,3 +1,5 @@
++=encoding latin1
++
+ =head1 NOME
+
+ muttprint - stampa raffinata della posta elettronica con Mutt
diff --git a/app-misc/muttprint/files/muttprint-0.73-warning.patch b/app-misc/muttprint/files/muttprint-0.73-warning.patch
new file mode 100644
index 000000000000..e17f658732d9
--- /dev/null
+++ b/app-misc/muttprint/files/muttprint-0.73-warning.patch
@@ -0,0 +1,20 @@
+diff -Nur a/muttprint b/muttprint
+--- a/muttprint 2012-04-28 13:46:46.109925472 +0200
++++ b/muttprint 2012-04-28 13:48:40.919924827 +0200
+@@ -740,6 +740,8 @@
+ }
+ }
+
++chdir($ENV{HOME}) || chdir('/');
++
+ ################################### ENDE ####################################
+
+
+@@ -1791,6 +1793,7 @@
+ output \*STDERR, $messageString;
+ }
+ }
++ chdir($ENV{HOME}) || chdir('/');
+ exit 1;
+ }
+
diff --git a/app-misc/muttprint/metadata.xml b/app-misc/muttprint/metadata.xml
new file mode 100644
index 000000000000..acd6628e6977
--- /dev/null
+++ b/app-misc/muttprint/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>nimiux@gentoo.org</email>
+ <name>Chema Alonso</name>
+ </maintainer>
+ <longdescription lang="en">
+ Pretty printing of your mails
+ </longdescription>
+ <longdescription lang="es">
+ Impresión elegante de sus correos
+ </longdescription>
+ <use>
+ <flag name="doc">Builds documentation</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">muttprint</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/muttprint/muttprint-0.73-r4.ebuild b/app-misc/muttprint/muttprint-0.73-r4.ebuild
new file mode 100644
index 000000000000..0c5c35c17679
--- /dev/null
+++ b/app-misc/muttprint/muttprint-0.73-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Script for pretty printing of your mails"
+HOMEPAGE="http://muttprint.sourceforge.net"
+SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="doc"
+
+DEPEND="dev-lang/perl
+ virtual/latex-base
+ dev-texlive/texlive-fontsextra
+ doc? (
+ app-text/dvipsk
+ app-text/docbook-sgml-utils[jadetex] )"
+
+RDEPEND="dev-lang/perl
+ dev-perl/TimeDate
+ dev-perl/Text-Iconv
+ virtual/latex-base
+ dev-texlive/texlive-latexextra"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+patch_docs() {
+ sed -i -e 's/db2pdf/docbook2pdf/' "${S}"/configure.ac || die
+ for l in de en es it sl
+ do
+ sed -i -e "/^docdir/s/$/-${PV}/" \
+ -e 's/db2/docbook2/' -e 's/ -s / -d /' \
+ -e "s|manual-${l}-sed/||" \
+ -e "s/mv manual-${l}-sed.dvi/cp manual-${l}-sed.dvi/" \
+ "${S}"/doc/manual/${l}/Makefile.am || die
+ done
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-warning.patch"
+ epatch "${FILESDIR}/${P}-manuals.patch"
+ epatch "${FILESDIR}/${P}-pod-encoding.patch"
+ epatch "${FILESDIR}/${P}-fix-number-of-pages.patch"
+
+ if use doc ; then
+ # Patch docbook and docdir
+ patch_docs
+ else
+ # Don't do manuals
+ sed -i -e '/db2pdf/d' "${S}"/configure.ac || die
+ fi
+ sed -i -e "/^docdir/s/$/-${PV}/" "${S}"/Makefile.am || die
+
+ # The distfile does not include the png files, nor penguin.jpg
+ sed -i -e '/.*png /d' -e '/penguin.jpg /d' "${S}"/pics/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+ # Parallel build does not work when USE="doc"
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog
+}
diff --git a/app-misc/mvcase-0.1-r2 b/app-misc/mvcase-0.1-r2
deleted file mode 100644
index b23ff16c44a0..000000000000
--- a/app-misc/mvcase-0.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/shhopt
-DESCRIPTION=A modified version of mv, used to convert filenames to lower/upper case
-EAPI=6
-HOMEPAGE=https://www.ibiblio.org/pub/Linux/utils/file
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/shhopt
-SLOT=0
-SRC_URI=https://www.ibiblio.org/pub/Linux/utils/file/mvcase-0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa9dd89aeb5fa6c42310b04b6e713187
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
new file mode 100644
index 000000000000..bfd7964ec934
--- /dev/null
+++ b/app-misc/mvcase/Manifest
@@ -0,0 +1,5 @@
+AUX mvcase-0.1-flags.patch 531 BLAKE2B be56f4ebf49427f3d6202ca78bf76d40419055235bb85f0a0f3856928a8f62d68600da7daedcb8d32497e06ec66c723c51c93b36ce2d84049caf3330ffde3398 SHA512 1731eacbd22438e4e888750ba5550b5d95365e2f396e3a59326c86d3cd8c20dc7a46490fd116ade13e6191a86966ebb77df4a5a2e10fb2961f45a0f9664a4b77
+AUX mvcase-0.1-includes.patch 526 BLAKE2B 1ae38fd8c03a82694fd57c9af033443d3e0a09a794686ca87419167dfd16697addb57a2f73923a8435c88fd82c5555b0715bc541f2eb377aa9f2e6389b14d311 SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f
+DIST mvcase-0.1.tar.gz 9467 BLAKE2B 4f73908cb549af143582f2f046096b5ffc82bd68a7be9d599bcea159d2182a52d37b9afb7e6e5e3fcb2ad01fd647c3649dae56ed47258166884a20e81b00d40b SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c
+EBUILD mvcase-0.1-r2.ebuild 640 BLAKE2B 12b93a85c6e13863e9d1ba3783ba78c5ab59f51d489c1589f365e9dbee47d2ad49a24260f3155940d9c9447a641cdb1fcc596e98a5e704ea47e3a6b86cb6151a SHA512 ddb49575202acdba13e9a1309ff2642c8c0d4f61b8f05a2ed6b7dfd2b041990584b067be6f552f6bf9a91ea7390c6534096e0e9042ef0677603db070df0867d3
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mvcase/files/mvcase-0.1-flags.patch b/app-misc/mvcase/files/mvcase-0.1-flags.patch
new file mode 100644
index 000000000000..e0a9e99160f8
--- /dev/null
+++ b/app-misc/mvcase/files/mvcase-0.1-flags.patch
@@ -0,0 +1,25 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Nov 14 23:22:15 UTC 2012
+Subject: build system
+
+ respect CC, CFLAGS and LDFLAGS
+
+--- mvcase-0.1/Makefile
++++ mvcase-0.1/Makefile
+@@ -6,14 +6,13 @@
+ MANPATH=/usr/man
+ COMPILE=gcc
+ ROFF=groff
+-CFLAGS=
+-CLIBS=-lshhopt
++LIBS=-lshhopt
+ INSTALL=install
+
+ all: mvcase mvcase.1.gz
+
+ mvcase: mvcase.c
+- $(COMPILE) $(CFLAGS) mvcase.c -o mvcase $(CLIBS)
++ $(CC) $(CFLAGS) mvcase.c -o mvcase $(LDFLAGS) $(LIBS)
+
+ mvcase.1.gz: mvcase.1
+ $(ROFF) -man -Tascii mvcase.1 | gzip > mvcase.1.gz
diff --git a/app-misc/mvcase/files/mvcase-0.1-includes.patch b/app-misc/mvcase/files/mvcase-0.1-includes.patch
new file mode 100644
index 000000000000..095f07a06780
--- /dev/null
+++ b/app-misc/mvcase/files/mvcase-0.1-includes.patch
@@ -0,0 +1,25 @@
+* Fix compiler warnings.
+* Remove unused variable.
+
+--- a/mvcase.c
++++ b/mvcase.c
+@@ -17,6 +17,10 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h> /* exit() free() realloc() */
++#include <string.h> /* strlen() strcpy() */
++#include <strings.h> /* rindex() */
++#include <ctype.h> /* tolower() toupper() */
+ #include <shhopt.h>
+
+ #define VERSION_INT 0
+@@ -45,7 +45,7 @@
+
+ int main (int argc, char **argv)
+ {
+- int i,j,k;
++ int i,j;
+ int static flag_upper = 0;
+ int static flag_lower = 0;
+ int static flag_path = 0;
diff --git a/app-misc/mvcase/metadata.xml b/app-misc/mvcase/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/mvcase/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r2.ebuild
new file mode 100644
index 000000000000..870ed73f8977
--- /dev/null
+++ b/app-misc/mvcase/mvcase-0.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A modified version of mv, used to convert filenames to lower/upper case"
+HOMEPAGE="https://www.ibiblio.org/pub/Linux/utils/file"
+SRC_URI="https://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="dev-libs/shhopt"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-includes.patch"
+ "${FILESDIR}/${P}-flags.patch"
+)
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/neofetch-3.4.0 b/app-misc/neofetch-3.4.0
deleted file mode 100644
index 8a2bb5743e97..000000000000
--- a/app-misc/neofetch-3.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=6
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=amd64 x86 ~amd64-fbsd
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/3.4.0/neofetch-3.4.0.tar.gz
-_md5_=5ab7648dd2ef56a9e936d591d46928d9
diff --git a/app-misc/neofetch-4.0.2 b/app-misc/neofetch-4.0.2
deleted file mode 100644
index d544b8ab6485..000000000000
--- a/app-misc/neofetch-4.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=7
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/4.0.2/neofetch-4.0.2.tar.gz
-_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/app-misc/neofetch-5.0.0 b/app-misc/neofetch-5.0.0
deleted file mode 100644
index 8947cc1a14f1..000000000000
--- a/app-misc/neofetch-5.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Simple information system script
-EAPI=7
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
-SLOT=0
-SRC_URI=https://github.com/dylanaraps/neofetch/archive/5.0.0/neofetch-5.0.0.tar.gz
-_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/app-misc/neofetch-9999 b/app-misc/neofetch-9999
deleted file mode 100644
index aa34f9c3fa6c..000000000000
--- a/app-misc/neofetch-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=unpack
-DESCRIPTION=Simple information system script
-EAPI=7
-HOMEPAGE=https://github.com/dylanaraps/neofetch
-IUSE=X
-LICENSE=MIT-with-advertising
-RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
new file mode 100644
index 000000000000..6303a559e54d
--- /dev/null
+++ b/app-misc/neofetch/Manifest
@@ -0,0 +1,8 @@
+DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
+DIST neofetch-4.0.2.tar.gz 111792 BLAKE2B 865c45a366224915aeeff82c843c869685814ccb5f553d7da59ab51e26336500cb133b5c827dd6dccccef3e771b357852e86db166d88cda894515419e9eadbc8 SHA512 326b7a9fdf08aa10b790c281148946727dc6a10c5c073654fc0ce9cee9afe663de84ac13144cb3e1d2e33b5ca3ed5094d2cb83e78b7b5f6e1ced49d78e191ce4
+DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
+EBUILD neofetch-3.4.0.ebuild 528 BLAKE2B 55af7ef9e6137fe42359f3db5af58c3418d4efbb9c1cf2dd5321acb0990e31de3db5258bc1bd6f4784e54cc4e9b3dd6abfc7ebe7c6dc366d72ebba82f6964042 SHA512 21b9a4f2d6df165860872f58794b34550df3dcacc5a9a3673a5ac45eab46fa7e2c3de238f266f7ef3944aacfe6787b1debf70d8f7b85fb4c186029efdf78a2df
+EBUILD neofetch-4.0.2.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
+EBUILD neofetch-5.0.0.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
+EBUILD neofetch-9999.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
+MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/metadata.xml b/app-misc/neofetch/metadata.xml
new file mode 100644
index 000000000000..36155d9d6674
--- /dev/null
+++ b/app-misc/neofetch/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>herdiansyah@netc.eu</email>
+ <name>Muhammad Herdiansyah</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ neofetch is a script that gathers information about your system and
+ prints it to the terminal next to an image, a distro's logo or any
+ ASCII art of your choice.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">dylanaraps/neofetch</remote-id>
+ </upstream>
+ <use>
+ <flag name="X">Enable support for detecting DEs, WMs, screen resolutions, and showing images from an X terminal</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild
new file mode 100644
index 000000000000..861c13b16942
--- /dev/null
+++ b/app-misc/neofetch/neofetch-3.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+ X? (
+ media-gfx/imagemagick
+ media-libs/imlib2
+ www-client/w3m[imlib]
+ x11-apps/xprop
+ x11-apps/xrandr
+ x11-apps/xwininfo
+ )"
diff --git a/app-misc/neofetch/neofetch-4.0.2.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild
new file mode 100644
index 000000000000..4757864917ab
--- /dev/null
+++ b/app-misc/neofetch/neofetch-4.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+ X? (
+ media-gfx/imagemagick
+ media-libs/imlib2
+ www-client/w3m[imlib]
+ x11-apps/xprop
+ x11-apps/xrandr
+ x11-apps/xwininfo
+ )"
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
new file mode 100644
index 000000000000..4757864917ab
--- /dev/null
+++ b/app-misc/neofetch/neofetch-5.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+ X? (
+ media-gfx/imagemagick
+ media-libs/imlib2
+ www-client/w3m[imlib]
+ x11-apps/xprop
+ x11-apps/xrandr
+ x11-apps/xwininfo
+ )"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
new file mode 100644
index 000000000000..4757864917ab
--- /dev/null
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+ X? (
+ media-gfx/imagemagick
+ media-libs/imlib2
+ www-client/w3m[imlib]
+ x11-apps/xprop
+ x11-apps/xrandr
+ x11-apps/xwininfo
+ )"
diff --git a/app-misc/nnn-1.6 b/app-misc/nnn-1.6
deleted file mode 100644
index 2acf7b75cf82..000000000000
--- a/app-misc/nnn-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-IUSE=bash-completion fish-completion zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v1.6.tar.gz -> nnn-1.6.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=660a26bbd369ef9f621d69ade6af53b9
diff --git a/app-misc/nnn-1.8 b/app-misc/nnn-1.8
deleted file mode 100644
index e41407a25035..000000000000
--- a/app-misc/nnn-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-IUSE=bash-completion fish-completion zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v1.8.tar.gz -> nnn-1.8.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=660a26bbd369ef9f621d69ade6af53b9
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
new file mode 100644
index 000000000000..679331f0efe1
--- /dev/null
+++ b/app-misc/nnn/Manifest
@@ -0,0 +1,5 @@
+DIST nnn-1.6.tar.gz 37456 BLAKE2B 90a6bcf7123b763585a05d5898ecee129561fa11dddbc40125f536b96315e4847b6187615df2bb6e0262d3df5efeec83d6681092ed69e4b65cd5486cf396e7e6 SHA512 7172f37f98f15b37cd2959c5ad144d32f55cde9cd2fe3221fc7a23887d3326da924c9be0bdc61a01a4d98ceb9b03de2420a66cc2cbf94a2ae1547da206e4c49a
+DIST nnn-1.8.tar.gz 42534 BLAKE2B acf1f9e211ddf688da96c77364f8eb2d12c853fa528774f2a3f8fa146203b155df089f6a3c995f0415d5349e9bb0c519cd0776c77094a83c23ecfe45561c846d SHA512 dfa3fc20cc9d77dc6a998913d79c1f98467f9e0f475d43317fe5b3b7c85f04a8aa1508305307873115ff810f5e212272e8348af9d8bd5283f48ad76ed34cad55
+EBUILD nnn-1.6.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+EBUILD nnn-1.8.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+MISC metadata.xml 324 BLAKE2B abbc05bbc35735d7a931021eac9e8f9a4584867c885fea581f57d7b4e9d83be1b2b3ec8b5246c1ecafd9c1e55078d66fa1cac22a8321beb5d4912a596c721e48 SHA512 291b497b906b3fdcbee656d90292d5b267c4082d1864e38f64938ce2d3b8aa56ca782d217f3a0776049db5dd7da416a4200e86f91da7075c54998b5901f78ef5
diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
new file mode 100644
index 000000000000..a919cc815a67
--- /dev/null
+++ b/app-misc/nnn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+</maintainer>
+<use>
+ <flag name="fish-completion">Enable fish completion support</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/nnn/nnn-1.6.ebuild b/app-misc/nnn/nnn-1.6.ebuild
new file mode 100644
index 000000000000..b1965355b427
--- /dev/null
+++ b/app-misc/nnn/nnn-1.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion fish-completion zsh-completion"
+
+DEPEND="sys-libs/ncurses:0=
+ sys-libs/readline:0="
+RDEPEND="${DEPEND}
+ fish-completion? ( app-shells/fish )
+ zsh-completion? ( app-shells/zsh )"
+
+src_prepare() {
+ default
+ tc-export CC
+ sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+ emake PREFIX="/usr" DESTDIR="${D}" install
+
+ use bash-completion &&
+ newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+ if use fish-completion; then
+ insinto /usr/share/fish/completions
+ doins scripts/auto-completion/fish/nnn.fish
+ fi
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins scripts/auto-completion/zsh/_nnn
+ fi
+
+ einstalldocs
+}
diff --git a/app-misc/nnn/nnn-1.8.ebuild b/app-misc/nnn/nnn-1.8.ebuild
new file mode 100644
index 000000000000..b1965355b427
--- /dev/null
+++ b/app-misc/nnn/nnn-1.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion fish-completion zsh-completion"
+
+DEPEND="sys-libs/ncurses:0=
+ sys-libs/readline:0="
+RDEPEND="${DEPEND}
+ fish-completion? ( app-shells/fish )
+ zsh-completion? ( app-shells/zsh )"
+
+src_prepare() {
+ default
+ tc-export CC
+ sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+ emake PREFIX="/usr" DESTDIR="${D}" install
+
+ use bash-completion &&
+ newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+ if use fish-completion; then
+ insinto /usr/share/fish/completions
+ doins scripts/auto-completion/fish/nnn.fish
+ fi
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins scripts/auto-completion/zsh/_nnn
+ fi
+
+ einstalldocs
+}
diff --git a/app-misc/no-more-secrets-9999 b/app-misc/no-more-secrets-9999
deleted file mode 100644
index b1668aeea6b1..000000000000
--- a/app-misc/no-more-secrets-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=sys-libs/ncurses:0= >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=recreate decrypting text from 1992 movie 'Sneakers'
-EAPI=5
-HOMEPAGE=https://github.com/bartobri/no-more-secrets
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=373b65815c392b328914b6c0e58cfd92
diff --git a/app-misc/no-more-secrets/Manifest b/app-misc/no-more-secrets/Manifest
new file mode 100644
index 000000000000..a3233522f657
--- /dev/null
+++ b/app-misc/no-more-secrets/Manifest
@@ -0,0 +1,2 @@
+EBUILD no-more-secrets-9999.ebuild 758 BLAKE2B 39252ebfaffaecc5cc1b907fc8918946ae1c36f66200c5867e64cf9dd56672b833dbf99fcfc2051c4ec946ba97a9d20bcb0302a17ab51e84844883b4ce9e8aee SHA512 eb8b8c5203b3b74066b92a8476736108e3fb5a7de882537660786e649b735b49cceddec0162cf64b307af1202a0ab45469f938ef988a192bc6f485c219c3a782
+MISC metadata.xml 336 BLAKE2B 9799273f7a650e3998e4342a3c5a072b3785586258874784ed920433c2ea7efc10e3fc72c611112320a59bcf8de863a7d5f7f96ff6cf7d4147177f2d34a1f699 SHA512 8036e228fe0f0aefb9f73ed5ab0a31c87c21390184db1cd4262218afb8b7f4d80391af7315eddab410a7ee55be188f706efa97847af20ac37116d2cd3eaeb8dd
diff --git a/app-misc/no-more-secrets/metadata.xml b/app-misc/no-more-secrets/metadata.xml
new file mode 100644
index 000000000000..a67561f5f043
--- /dev/null
+++ b/app-misc/no-more-secrets/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bartobri/no-more-secrets</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/no-more-secrets/no-more-secrets-9999.ebuild b/app-misc/no-more-secrets/no-more-secrets-9999.ebuild
new file mode 100644
index 000000000000..d5955c438a05
--- /dev/null
+++ b/app-misc/no-more-secrets/no-more-secrets-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+#if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/bartobri/${PN}.git"
+ SRC_URI=""
+ inherit git-r3
+ KEYWORDS=""
+#else
+# SRC_URI=""
+# KEYWORDS=""
+#fi
+
+DESCRIPTION="recreate decrypting text from 1992 movie 'Sneakers'"
+HOMEPAGE="https://github.com/bartobri/no-more-secrets"
+
+LICENSE="GPL-3"
+SLOT=0
+
+DEPEND="sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i 's#CC =#CC ?=#' Makefile
+ sed -i 's#prefix =#prefix ?=#' Makefile
+ sed -i 's#CFLAGS =#CFLAGS ?=#' Makefile
+}
+
+src_compile() {
+ CC=$(tc-getCC) CFLAGS=${CFLAGS} emake
+}
+
+src_install() {
+ prefix=/usr DESTDIR="${ED}" emake install
+}
diff --git a/app-misc/notary-0.6.1-r1 b/app-misc/notary-0.6.1-r1
deleted file mode 100644
index 6fea603535b7..000000000000
--- a/app-misc/notary-0.6.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A project that allows anyone to have trust over arbitrary collections of data
-EAPI=6
-HOMEPAGE=https://github.com/theupdateframework/notary
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/theupdateframework/notary/archive/v0.6.1.tar.gz -> notary-0.6.1.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=d93fbad1058b24d44b6177769819957c
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
new file mode 100644
index 000000000000..292257447e4f
--- /dev/null
+++ b/app-misc/notary/Manifest
@@ -0,0 +1,7 @@
+AUX notary-server.confd 103 BLAKE2B 1f1a9f0e006bfd172218c40980a34314dffc1d06bc2a672d206fdc5f7b79ee918eeb35c79594ed954b045a28e49dfac2881fb4bfcde4db541ad94cd9c0078237 SHA512 2882af398f78011c5fce816adfc223833b808ba88dd334b85bbd97caa296cf2ca0b5e92f369307ad0066f98502367c62c1fed4e792d2f7074769f99c02a3c826
+AUX notary-server.initd 568 BLAKE2B a38ceeadc4d3bd663dced340da3040b352081dce6d27f44afead3fb05a55e9c271fbcb75746201c494cbc6218feea9bca666831443e9fd765bfa6ba6f3f81f9c SHA512 97a4666a5bbb5345103a0b1a2a2f04e5f1e3546b253bcb23d1170ce3ee056ea0baf328d40db67b18116c5cc81a1dd03489cef2edfe94044f08366833e0262c5f
+AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d99883496a9622fd04c19d097a498195c9e37246420f4f01fef07219bd4c9e76dc26cf8b70d9ce43ab1c7 SHA512 088bbd2eabf1e9be673b35a4a481c270ba2ccea479ef1164804ecead730a61465862888e7cbff53976056826d4ff066e1e2ab253cd6e3287109d03873c11777b
+AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2
+DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3
+EBUILD notary-0.6.1-r1.ebuild 1654 BLAKE2B e3d50255904169cd8c1bcc4142464a8c4eea30522e58be5fb38b7a90944a2cf72620e39d4600e8a9bdca8a96a276ce632ee812a67fb3edc1ab80d59681599a2f SHA512 bb6b3601e91bc912d0ca062832fdf067dd40eef167e102577fe4bafd560de76e4839cef92f0d207e1480a9e28c441165fad5f68157b588738c24dbf0af42f9b7
+MISC metadata.xml 345 BLAKE2B d1f59c5babe626b5a04645c4ef693cad477fc053d0730464e4b48bee515555ded5a583ca2ae246b80af310e096c334e99717af8e1be3adf692a4c9cf8f97c430 SHA512 6a57f443fe0f4e857d41a7af2658e9eac580750e7eeeab5ea6ebd5cea154c3baf74c838095c0c97493c344525d3377e3559b7c05ca5d141bdb5efda85a13eb22
diff --git a/app-misc/notary/files/notary-server.confd b/app-misc/notary/files/notary-server.confd
new file mode 100644
index 000000000000..eb47b978cbe3
--- /dev/null
+++ b/app-misc/notary/files/notary-server.confd
@@ -0,0 +1,2 @@
+# arguments for notary server
+command_args="-config=/var/lib/notary/fixtures/server-config-local.json"
diff --git a/app-misc/notary/files/notary-server.initd b/app-misc/notary/files/notary-server.initd
new file mode 100644
index 000000000000..6d2bd22fc613
--- /dev/null
+++ b/app-misc/notary/files/notary-server.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Notary server"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-notary}
+group=${group:-notary}
+
+command="/usr/bin/notary-server"
+command_args="${command_args:--config=/var/lib/notary/fixtures/server-config-local.json}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/notary/${RC_SVCNAME}.log \
+ --stderr /var/log/notary/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/app-misc/notary/files/notary-signer.confd b/app-misc/notary/files/notary-signer.confd
new file mode 100644
index 000000000000..5ead0d85b2c9
--- /dev/null
+++ b/app-misc/notary/files/notary-signer.confd
@@ -0,0 +1,2 @@
+# arguments for notary signer
+command_args="-config=/var/lib/notary/fixtures/signer-config-local.json"
diff --git a/app-misc/notary/files/notary-signer.initd b/app-misc/notary/files/notary-signer.initd
new file mode 100644
index 000000000000..5238b31b5b46
--- /dev/null
+++ b/app-misc/notary/files/notary-signer.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Notary signer"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-notary}
+group=${group:-notary}
+
+command="/usr/bin/notary-signer"
+command_args="${command_args:--config=/var/lib/notary/fixtures/signer-config-local.json}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/notary/${RC_SVCNAME}.log \
+ --stderr /var/log/notary/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/app-misc/notary/metadata.xml b/app-misc/notary/metadata.xml
new file mode 100644
index 000000000000..0f3553a0a4cc
--- /dev/null
+++ b/app-misc/notary/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">theupdateframework/notary</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/notary/notary-0.6.1-r1.ebuild b/app-misc/notary/notary-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..00221646040f
--- /dev/null
+++ b/app-misc/notary/notary-0.6.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot golang-build user
+
+KEYWORDS="~amd64"
+DESCRIPTION="A project that allows anyone to have trust over arbitrary collections of data"
+EGO_PN="github.com/theupdateframework/notary"
+GIT_COMMIT="d6e1431feb32348e0650bf7551ac5cffd01d857b"
+
+HOMEPAGE="https://github.com/theupdateframework/notary"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
+ ${EGO_PN}/cmd/notary-server || die
+ GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
+ ${EGO_PN}/cmd/notary-signer || die
+ GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
+ ${EGO_PN}/cmd/notary || die
+ popd || die
+}
+
+src_install() {
+ dobin bin/${PN}{,-server,-signer}
+ pushd src/${EGO_PN} || die
+ insinto /var/lib/notary
+ doins -r migrations fixtures
+ fowners -R ${PN}:${PN} /var/lib/notary
+ fperms -R 0600 /var/lib/notary/fixtures/database/
+ newinitd "${FILESDIR}"/notary-signer.initd notary-signer
+ newconfd "${FILESDIR}"/notary-signer.confd notary-signer
+ newinitd "${FILESDIR}"/notary-server.initd notary-server
+ newconfd "${FILESDIR}"/notary-server.confd notary-server
+}
diff --git a/app-misc/note-1.3.3-r1 b/app-misc/note-1.3.3-r1
deleted file mode 100644
index 72f631c349c0..000000000000
--- a/app-misc/note-1.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/TermReadKey dev-perl/Term-ReadLine-Perl virtual/perl-Storable dev-perl/Config-General crypt? ( dev-perl/Crypt-CBC dev-perl/Crypt-Blowfish dev-perl/Crypt-DES ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A note taking perl program
-EAPI=5
-HOMEPAGE=http://www.daemon.de/NOTE
-IUSE=crypt dbm general mysql text
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/note-1.3.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5c176a29e116c418090423f9e0ae9fa
diff --git a/app-misc/note/Manifest b/app-misc/note/Manifest
new file mode 100644
index 000000000000..d782ceceec2f
--- /dev/null
+++ b/app-misc/note/Manifest
@@ -0,0 +1,3 @@
+DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
+EBUILD note-1.3.3-r1.ebuild 1231 BLAKE2B ba0eef1712c8668bf5fb31b3f6c65b760030bac6f15201111c93ec9b6915735cee9ca434ac4c94d258a397f419379f45ae1feceee80d9bc7ec094560eb17694c SHA512 3510b02d469fc064209e3534db4353c51cd5057ab329d1cde7fa363e1b1a89ddf18b1ec3e7ee15b6b98eb563a93c48a053558a043a5313696261081f16174c2f
+MISC metadata.xml 304 BLAKE2B 31f4157a7266980036c3450e1a3fa977448d5d5080189bb76c0dc974e6de75ce80b4f675f2f7a2bfa216c918337539f800d7f029e9ca9f930ac797caf8caf6d6 SHA512 0f0f283bc7066279d7d9dc7e9148173b1f7c5efdae22cf9013e6b04d15f68889016fb1c856d0a7906961023aaa7c302f93b8c5d2a0f65a4a333d318f699c70bc
diff --git a/app-misc/note/metadata.xml b/app-misc/note/metadata.xml
new file mode 100644
index 000000000000..83abb215223d
--- /dev/null
+++ b/app-misc/note/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+ <flag name="general">Add support for ascii flatfile backend</flag>
+ <flag name="text">Add support for text backend</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/note/note-1.3.3-r1.ebuild b/app-misc/note/note-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..35fba906d5da
--- /dev/null
+++ b/app-misc/note/note-1.3.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A note taking perl program"
+HOMEPAGE="http://www.daemon.de/NOTE"
+SRC_URI="http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="crypt dbm general mysql text"
+
+DEPEND="dev-perl/TermReadKey
+ dev-perl/Term-ReadLine-Perl
+ virtual/perl-Storable
+ dev-perl/Config-General
+ crypt? ( dev-perl/Crypt-CBC
+ dev-perl/Crypt-Blowfish
+ dev-perl/Crypt-DES )
+ mysql? ( virtual/mysql
+ dev-perl/DBD-mysql )"
+RDEPEND=""
+
+src_install() {
+ perl-module_src_install
+
+ # Adding some basic utitily for testing note
+ dodir /usr/share/${PN}
+ cp "${S}/bin/stresstest.sh" "${D}/usr/share/${PN}"
+
+ # Adding some help for mysql backend driver
+ if use mysql; then
+ dodir /usr/share/${PN}/mysql
+ cp -r "${S}/mysql" "${D}/usr/share/${PN}"
+ fi
+
+ # Adding a sample configuration file
+ dodir /etc
+ cp "${S}/config/noterc" "${D}/etc"
+
+ # Supressing file not needed
+ for v in mysql text dbm general; do
+ if ! use ${v}; then
+ for u in `find "${D}" -type f -name *${v}.*pm`; do
+ rm "${u}"
+ done
+ fi
+ done
+
+ dodoc UPGRADE VERSION
+}
diff --git a/app-misc/nullmodem-0.0.6-r1 b/app-misc/nullmodem-0.0.6-r1
deleted file mode 100644
index 24d30b4a9ac2..000000000000
--- a/app-misc/nullmodem-0.0.6-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A Utility to loopback Pseudo-Terminals
-EAPI=6
-HOMEPAGE=http://www.ant.uni-bremen.de/whomes/rinas/nullmodem/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.ant.uni-bremen.de/whomes/rinas/nullmodem/download/nullmodem-0.0.6.tar.gz
-_md5_=98181b999583dd5f7b77b1d05323b8f7
diff --git a/app-misc/nullmodem/Manifest b/app-misc/nullmodem/Manifest
new file mode 100644
index 000000000000..db7beb9ebc75
--- /dev/null
+++ b/app-misc/nullmodem/Manifest
@@ -0,0 +1,3 @@
+DIST nullmodem-0.0.6.tar.gz 350584 BLAKE2B 16b535256d7cd961fc42c2447770bac3898d5eb386b1d3b456c9876383970bd4e82f2653ec8a6a47e92dab1e7e5052ae070b98ac494e3a205f8891db5f95be68 SHA512 d87c4ceaaa16f67c4ddc42d86f8ed81f0e14e1180b25e9000868f715b2f553d0cc165812d1f945a83486cf1c356c1303682eb17fb12632252d28bcb84edeec7c
+EBUILD nullmodem-0.0.6-r1.ebuild 365 BLAKE2B 2b3750363edc7cd9f7a78ff8ebab311ed103d1cee74d4b4947d8198db0d340b317f533f1df0d0f87beea78629497b135df8781de948eb1384e48f0bb72148b0a SHA512 3ca4d671a850cf6a85a81278292c2f9c8905eeeea257b213fe62bdbfecfa7fe7dceb7cf564fa9ecf5c03dbe9e7fb2f425b37aad133adcd7bd0605cc4411d657b
+MISC metadata.xml 1054 BLAKE2B 1005e2832dc382fa6cc97afdf992a9942fa9c965caab6e1f2ad1d1bc83a2cb8dc7d065903c68bb95066ea87b6eeed043c35c6508b797d07884741916c3d9af77 SHA512 3bcee62e26aa142670a2450cb22a731e987d4d77a29720c3f33e46f36ba7f4c3bca1a86adf3e9be03ebd63f49ec1896a01087138349e29578c9028d52c748eb1
diff --git a/app-misc/nullmodem/metadata.xml b/app-misc/nullmodem/metadata.xml
new file mode 100644
index 000000000000..815e2658c87a
--- /dev/null
+++ b/app-misc/nullmodem/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>tomjbe@gentoo.org</email>
+</maintainer>
+<longdescription>
+Pseudo-Terminals (ptys) are a type of interprocess communication with a master
+and a slave end. One program (in our case nullmodem) opens the master sides of
+connections and therefore provides connectible slave sides of connections.
+If nullmodem receives some data on one of these connections it retransmits them
+on all other connections. It can be seen as a network with star-type wiring.
+Because the names of the slave side ptys are dynamic, nullmodem creates
+symbolic links to filenames of your choice.
+e.g. the command nullmodem /tmp/loop0 /tmp/loop1 /tmp/loop2
+creates a pty-network with 3 slave sides linked to the names /tmp/loop0,
+/tmp/loop1 and /tmp/loop2.
+If you close a slave side connection nullmodem will detect this and provide
+a new stub to connect to and update the symbolic link.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/nullmodem/nullmodem-0.0.6-r1.ebuild b/app-misc/nullmodem/nullmodem-0.0.6-r1.ebuild
new file mode 100644
index 000000000000..25b0bf4a624f
--- /dev/null
+++ b/app-misc/nullmodem/nullmodem-0.0.6-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Utility to loopback Pseudo-Terminals"
+HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/nullmodem/"
+SRC_URI="http://www.ant.uni-bremen.de/whomes/rinas/nullmodem/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-misc/nut-20.1 b/app-misc/nut-20.1
deleted file mode 100644
index 3e67e293b0e8..000000000000
--- a/app-misc/nut-20.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Record what you eat and analyze your nutrient levels
-EAPI=5
-HOMEPAGE=http://nut.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/nut/nut-20.1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=9f63b455b7e1b29b0390fbab69215ecf
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
new file mode 100644
index 000000000000..ba14e0ff65cd
--- /dev/null
+++ b/app-misc/nut/Manifest
@@ -0,0 +1,3 @@
+DIST nut-20.1.tar.gz 1441077 BLAKE2B 70233f6bee4df5c9eee91a313506e545accdd68e10b0ef71dcf42d83082fe44dc9d48e049801efb7e7f26458dfb079cc824aec3e314d63b27a4b06dc75950528 SHA512 2ed79fb345f029f5deaed4e23531256f2f76f5ca05ae46d3d5f4503fef663cde81f6695a9b5b741d02c5880ef611fa8495fcce3bcadf1ca8abdbc2b395bced6a
+EBUILD nut-20.1.ebuild 550 BLAKE2B 44b60b5c6a9df83cb564b9df6efb96e281fa73102c5d4880f67e4ac8768a8398b755bb6854a59eb6837d4743bf8a9e78f45801c4a58d67e6ef2cb05437a2b934 SHA512 642b0ee3dfb59bfd56aa4c4f628a1b1a5105ebac8651868f60c732e6dc8e60542bd9ed53e2feb4ebc451624e2e686d6bc37d0dbdff4b6d5cf3fe3b2bfed0c66a
+MISC metadata.xml 240 BLAKE2B 466e0fb40b32dadf0d9da30dd0f76744e00ad50624d7af31496897906fc02b13f506a438c6f96cd90dcd6fc7cabb537e6c55fa1bac98d46ca46b191af3f974e9 SHA512 e15cb3ce921cd91bbd35380b54275fb316cb61e132a7d11f679afe1b191c54e117953b1102ea1c86d73b59f6f13613cab9c37b0c077a21f2715aff61a413cbf9
diff --git a/app-misc/nut/metadata.xml b/app-misc/nut/metadata.xml
new file mode 100644
index 000000000000..9f2111ca9eb9
--- /dev/null
+++ b/app-misc/nut/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">nut</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/nut/nut-20.1.ebuild b/app-misc/nut/nut-20.1.ebuild
new file mode 100644
index 000000000000..3c028aa44a87
--- /dev/null
+++ b/app-misc/nut/nut-20.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\" \
+ nut
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/*
+
+ dobin nut
+ doman nut.1
+}
diff --git a/app-misc/ondir-0.2.2-r2 b/app-misc/ondir-0.2.2-r2
deleted file mode 100644
index 715486511f43..000000000000
--- a/app-misc/ondir-0.2.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=Automatically execute scripts as you traverse directories
-EAPI=6
-HOMEPAGE=http://swapoff.org/OnDir
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-apps/sed
-SLOT=0
-SRC_URI=http://swapoff.org/files/ondir/ondir-0.2.2.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3314c1abd3d3b45dfe02730da4e717c6
diff --git a/app-misc/ondir-0.2.4 b/app-misc/ondir-0.2.4
deleted file mode 100644
index 84b80aeea97b..000000000000
--- a/app-misc/ondir-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=Automatically execute scripts as you traverse directories
-EAPI=6
-HOMEPAGE=http://swapoff.org/OnDir
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-apps/sed
-SLOT=0
-SRC_URI=http://swapoff.org/files/ondir/ondir-0.2.4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a91816a62e8eec0454584c8b3c7a02a1
diff --git a/app-misc/ondir/Manifest b/app-misc/ondir/Manifest
new file mode 100644
index 000000000000..bfb9fd8c5606
--- /dev/null
+++ b/app-misc/ondir/Manifest
@@ -0,0 +1,5 @@
+DIST ondir-0.2.2.tar.gz 20138 BLAKE2B 3724b8d356cec16e1f60ec49574e2f688d4f7456f48f1d909402e8436f588d9617c827eda9a74c1b930d2538fe8c9d1372a1d222124d8f7b863bf8e895cfaa25 SHA512 5c2c53532934b25d2a170c619d067c369b6acf2ef3e0a87607619613dcc0bbfc570937fb91cdc5df3f22ae0453b5a5d00edd57cd1b852f7a076c15b96c45d4dd
+DIST ondir-0.2.4.tar.gz 52860 BLAKE2B e9111f9a64d8d7393d9a8e48d5dc66d5814995ae1dbd2f577538a03021c1b1b92af43acbd0ab9cb24ab29ba16c50d5752a9442689effc62bd8c13b6fe11a4785 SHA512 f59a823807f86ce2992aaf5fb174ddea222b02ed18e1289ca450179bd090892f1467072dfcec97ce219e216c055781ea7a1a05bb9402276fb9404a57f42ddb52
+EBUILD ondir-0.2.2-r2.ebuild 983 BLAKE2B 1ad1bf96ffea8060f6a676183d5c200165e928cbf46e5a4ddc2dfdd342e150c53bc9375a8413fae34a2a0af147a34ab1cac6caa19b3858e0ae33e85bbeb4e8b6 SHA512 4da1bcf80437796ea0c427f3be610c406880ff76e2d59c651078ab86917c3a06ad3e1b5b017836d499a7cd3ad1095ea9a5308def391764c78dc042063b1af7fe
+EBUILD ondir-0.2.4.ebuild 936 BLAKE2B eaaf969c2efa62b1f186c2101ea597f22ec5d5a0731500615468238ea21a25ead29baf87e113d022380404c0082da32305eb77c5c36bef30c7e0871cc6eae8d7 SHA512 b76a67250437ff8cf6014502bec594bff0e3aeea9ea14b472e7c09bb02f2a8c2b595cd5e3a870cde4b63f15263a1c3a74b4620ce18402f96993a03cc8b30bc31
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/ondir/metadata.xml b/app-misc/ondir/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/ondir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/ondir/ondir-0.2.2-r2.ebuild b/app-misc/ondir/ondir-0.2.2-r2.ebuild
new file mode 100644
index 000000000000..59d6874ad10e
--- /dev/null
+++ b/app-misc/ondir/ondir-0.2.2-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically execute scripts as you traverse directories"
+HOMEPAGE="http://swapoff.org/OnDir"
+SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/sed"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README INSTALL scripts.tcsh scripts.sh )
+HTML_DOCS=( changelog.html ondir.1.html )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:\(/man/.*$\):/share\1:g" \
+ -e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ PREFIX="${EPREFIX}/usr" \
+ CONF="${EPREFIX}/etc/ondirrc" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ CONF="${EPREFIX}/etc/ondirrc" \
+ install
+ newdoc ondirrc.eg ondirrc.example
+}
diff --git a/app-misc/ondir/ondir-0.2.4.ebuild b/app-misc/ondir/ondir-0.2.4.ebuild
new file mode 100644
index 000000000000..2f51ec18dee6
--- /dev/null
+++ b/app-misc/ondir/ondir-0.2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically execute scripts as you traverse directories"
+HOMEPAGE="http://swapoff.org/OnDir"
+SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/sed"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL scripts.tcsh scripts.sh )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:\(/man/.*$\):/share\1:g" \
+ -e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ PREFIX="${EPREFIX}/usr" \
+ CONF="${EPREFIX}/etc/ondirrc" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ CONF="${EPREFIX}/etc/ondirrc" \
+ install
+ newdoc ondirrc.eg ondirrc.example
+}
diff --git a/app-misc/oneko-1.2-r2 b/app-misc/oneko-1.2-r2
deleted file mode 100644
index 527d70dbfdd5..000000000000
--- a/app-misc/oneko-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=5
-HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c871a9b66bda8befb782cb6c047c4fa0
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
new file mode 100644
index 000000000000..6ee1344b01c2
--- /dev/null
+++ b/app-misc/oneko/Manifest
@@ -0,0 +1,7 @@
+AUX oneko-1.2-include.patch 168 BLAKE2B 48b44fd9269c51a125ea9093c08b0d07e64ef58877c027a20dce75ac3584d8cecad20f785caa0d11b77bd25e9fc3785ddb7c3874c3cc7c7a79310984ac4af920 SHA512 001c47f84a921b2b963282d8132336a2b6368f85dbfa94e294d2dd2054a5697c12fd8d48ad73ae0e0b38039613c3e1b8866e832bedc6162d661bad71643a1702
+DIST oneko-1.2-cat.png 223 BLAKE2B 35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed62ffc37a94f9afdd54cac9c251eb82a85cbf7ef31af36c010d54310d79f079cf43a6ba3761ee3b18c34 SHA512 f3543be2bac0d14d3db5fe6bc33cf59caae743d547993fe010c79d2bfc6f8720d608026d692733b7519d5b6b99db09f58f34af9bd2d8fcc3556b6994734f24bf
+DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533
+DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189 SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e
+DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1 SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15
+EBUILD oneko-1.2-r2.ebuild 1673 BLAKE2B 01fb6acabb5e2d39f3634af2ff7d1998580757e4b17538682f3c8563b3c91c1641f0bedfbe418f3578a499fe9873163e09088e783f18f4c1b4e09fe12db9fb1b SHA512 cca224ca83a61edea8ba92bb3a7157756ed96a9dceac9624c4c221ce955646f797efba918df52856480fc3ceb8dd7859244a4051820263a4c2b0ffaa76ca7505
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/oneko/files/oneko-1.2-include.patch b/app-misc/oneko/files/oneko-1.2-include.patch
new file mode 100644
index 000000000000..70b3c2405a5c
--- /dev/null
+++ b/app-misc/oneko/files/oneko-1.2-include.patch
@@ -0,0 +1,10 @@
+--- a/oneko.h
++++ b/oneko.h
+@@ -14,6 +14,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h> /* pause() */
+ #include <string.h>
+
+ #include <signal.h>
diff --git a/app-misc/oneko/metadata.xml b/app-misc/oneko/metadata.xml
new file mode 100644
index 000000000000..2ba8e9e851e4
--- /dev/null
+++ b/app-misc/oneko/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
new file mode 100644
index 000000000000..9866e7ac2964
--- /dev/null
+++ b/app-misc/oneko/oneko-1.2-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
+HOMEPAGE="http://www.daidouji.com/oneko/"
+SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz
+ mirror://gentoo/${P}-cat.png
+ mirror://gentoo/${P}-dog.png
+ mirror://gentoo/${P}-sakura-nobsd.patch.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXext
+"
+DEPEND="
+ ${RDEPEND}
+ app-text/rman
+ x11-base/xorg-proto
+ x11-misc/gccmakedep
+ x11-misc/imake
+"
+
+S=${WORKDIR}/oneko-${PV}.sakura.5
+
+src_prepare() {
+ epatch \
+ "${WORKDIR}"/${P}-sakura-nobsd.patch \
+ "${FILESDIR}"/${P}-include.patch
+}
+
+src_configure() {
+ xmkmf -a || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CCOPTIONS="${CFLAGS}" \
+ EXTRA_LDOPTIONS="${LDFLAGS}" \
+ || die
+}
+
+src_install() {
+ dobin oneko
+ newman oneko._man oneko.1x
+ dodoc README README-NEW README-SUPP
+ newicon "${DISTDIR}/${P}-cat.png" "cat.png"
+ newicon "${DISTDIR}/${P}-dog.png" "dog.png"
+ make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
+ make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
+ make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
+}
+
+pkg_postinst() {
+ elog "To kill oneko, type the following in a terminal:"
+ elog ""
+ elog "killall oneko"
+ elog ""
+ elog "If your mouse cursor changes to the default black cross"
+ elog "after running ${PN}, you should emerge x11-apps/xsetroot"
+ elog "and run:"
+ elog ""
+ elog "xsetroot -cursor_name left_ptr"
+ elog ""
+}
diff --git a/app-misc/openastro-1.1.56 b/app-misc/openastro-1.1.56
deleted file mode 100644
index 1f20142e4489..000000000000
--- a/app-misc/openastro-1.1.56
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/openastro-data[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[svg(+),python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyswisseph[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] gnome-base/librsvg:2[introspection] x11-libs/gtk+:3[introspection] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A fully-featured Open Source Astrology Program
-EAPI=6
-HOMEPAGE=http://openastro.org
-IUSE=jpeg png python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-misc/openastro-data[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[svg(+),python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyswisseph[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] gnome-base/librsvg:2[introspection] x11-libs/gtk+:3[introspection] jpeg? ( media-gfx/imagemagick[jpeg,svg] ) png? ( media-gfx/imagemagick[png,svg] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org/openastro.org_1.1.56.orig.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44a380456d6bb350a94b3a6659e6c9b6
diff --git a/app-misc/openastro-data-1.6 b/app-misc/openastro-data-1.6
deleted file mode 100644
index d47d46353262..000000000000
--- a/app-misc/openastro-data-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenAstro data files, ephemeris, famous people database, geo database
-EAPI=6
-HOMEPAGE=http://openastro.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.6.orig.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eb1d7549b8bd3e7664361d367c7e4bc
diff --git a/app-misc/openastro-data-1.7 b/app-misc/openastro-data-1.7
deleted file mode 100644
index c38ca1de0bcd..000000000000
--- a/app-misc/openastro-data-1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenAstro data files, ephemeris, famous people database, geo database
-EAPI=6
-HOMEPAGE=http://openastro.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.7.orig.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67b6ffeef836bfddcdd5c3e88f3a2364
diff --git a/app-misc/openastro-data-1.8 b/app-misc/openastro-data-1.8
deleted file mode 100644
index 1f13ff6f9750..000000000000
--- a/app-misc/openastro-data-1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=OpenAstro data files, ephemeris, famous people database, geo database
-EAPI=6
-HOMEPAGE=http://openastro.org
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.8.orig.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa228cbbf5ec1eb8f2fb759eb58e7730
diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
new file mode 100644
index 000000000000..8430cd1b04f4
--- /dev/null
+++ b/app-misc/openastro-data/Manifest
@@ -0,0 +1,7 @@
+DIST openastro.org-data_1.6.orig.tar.gz 13603001 BLAKE2B 64a0850cc681c13eed672285edb5ebdf7b2adae6012f5525461312b6ede56c65d20b17c554220174c4e191bd326c8d201e5d6db49435e62b4a7a1d1e743ba3bc SHA512 99f3b6db61e27ccf04a7e0ff3ba7da45b889e1177bfbc1192af1929fca7255dc2b18a4ac9eb536af9ceb11e7722e0a3420102c7e45a6c839abe87734e8be6591
+DIST openastro.org-data_1.7.orig.tar.gz 15682188 BLAKE2B caa423b90fac8391bd30b6ed1f6b6065c91b5a1828defbbc753dc88ac23f3bfef8437b87d02dec4176fac419206ab5df4822e2353a36a0e92255d376e678ee54 SHA512 a67cc528253d0a9f70fdce550b8065c481e2dae8dc59dfed0428491cf4751648e41f0d6032b58008f2fe095f81fc4a23717156a69a73b03bd3105b50eb325ffe
+DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e7cfb96565676ed68945bed24a2927c9844fdedda980c9afdc06c4a88765d3aa31a2559fa5cec06381f90c27a244ed16b3f05e8f3a SHA512 79e2fa921b883400e29bcd7be3cf3f791d60ea164e3062b61e95608ec815aa3e8df093712658f71c45b60259ffe41531d32f4b65db5e7f642b63f267e9cce7af
+EBUILD openastro-data-1.6.ebuild 536 BLAKE2B fcaac146a091782e7560d18c54eeb11af4c9bb5342061fb2a78e84b7ba0860a31341452b3d8281e3c76478e4d72fd1c30a9087af6dac1e014d547da57c6491cf SHA512 7c674f9ed47af5c4e92de0180d083c3c1ab6d2545a827dcc8665ac69306a6f1c3b6c23b69e325e0191a563bfc0372f15fe577e71a93440dfeba08a9ec030ab2a
+EBUILD openastro-data-1.7.ebuild 536 BLAKE2B 4e6529414ed28d9a3f3666c28ad3b159ada8c1bc19012a6f9277547e3805d34bbb51577d70ea17611b58bb5b7d51288d0a0bd0dd5787b040619490a7c747cb2d SHA512 573683c1b529dbf6032329c338a1c9be018f6a4f587d123233c316209d63868b376b673c2636c32198b9aa48f5472bf484c55ec36a33007b9618d5ab5e21c7a2
+EBUILD openastro-data-1.8.ebuild 557 BLAKE2B b5cadc16f1bd965ac09a81a5674cb1f9cdfd47bed73b3ae10529b70c3ad626a802bf2c90f71b10c77b6283289d000a532fad6d3ae38dfbc14d02544cef72595d SHA512 e6955a4f9486e4a56147ea74fd70f72d348ed03e964f84a1a2aca54b5012bb11b62fb19797302075d90f83c6539212f3146e4a0690dac3b2d1f4c1eade1bd088
+MISC metadata.xml 391 BLAKE2B de44378c992fb6a7cc3fd16c2cec319b49dafc0da73f06e41ed08e48a57b97906f2e488bc2dc74d8850800762c3c70de3281af436dadf67d8a60b30226c795c3 SHA512 33213a04e12838729bdce8d1db7a395d337dbf65f9b00bdb3fac1f7a0764efd615a879942f03d9bec6476026d1fbc81e69a096bcd3831adada5b289bbbff483e
diff --git a/app-misc/openastro-data/metadata.xml b/app-misc/openastro-data/metadata.xml
new file mode 100644
index 000000000000..225f6c806bf0
--- /dev/null
+++ b/app-misc/openastro-data/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <maintainer status="active">
+ <email>devel@openastro.org</email>
+ <name>Pelle van der Scheer</name>
+ </maintainer>
+ <bugs-to>https://bugs.launchpad.net/openastro.org</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/openastro-data/openastro-data-1.6.ebuild b/app-misc/openastro-data/openastro-data-1.6.ebuild
new file mode 100644
index 000000000000..0609cf57e3a8
--- /dev/null
+++ b/app-misc/openastro-data/openastro-data-1.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-data}
+MY_PN=${MY_PN}.org-data
+
+DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro-data/openastro-data-1.7.ebuild b/app-misc/openastro-data/openastro-data-1.7.ebuild
new file mode 100644
index 000000000000..50b4ce85ce56
--- /dev/null
+++ b/app-misc/openastro-data/openastro-data-1.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-data}
+MY_PN=${MY_PN}.org-data
+
+DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro-data/openastro-data-1.8.ebuild b/app-misc/openastro-data/openastro-data-1.8.ebuild
new file mode 100644
index 000000000000..34fb99b46590
--- /dev/null
+++ b/app-misc/openastro-data/openastro-data-1.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-data}
+MY_PN=${MY_PN}.org-data
+
+DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
new file mode 100644
index 000000000000..60abbd6db30f
--- /dev/null
+++ b/app-misc/openastro/Manifest
@@ -0,0 +1,3 @@
+DIST openastro.org_1.1.56.orig.tar.gz 212271 BLAKE2B d0252ae7f3c4c4f255ab1e402f3491b2b61e295f2d2064bd6a25ba07424526cbba01f2fe9f255eced0037b4d05edd1b0cde2e0fdae5c0fd7849652d5f8bfb1c7 SHA512 0446575bde71ca5bc88177bf1d5b8088cd1bb8e29ecfbd83ff15ebc4da4f07534c987f8a00b555a0af85c613e5d6bd2cec60898b586110c2230570446e4b7f2d
+EBUILD openastro-1.1.56.ebuild 919 BLAKE2B 21726da473e1e56e06512ba566d1457fd4a5f73efc8d073bbecbcdb25eeb7e505ccfe7da7d50dacbefa32d3d3b161029cccc8c41760788a4ea54be6b2edfcb84 SHA512 684758d970d7515c5f82a8f137fa805376103221167f067584efacc42f57c157c996d255e3759a2910e1244d71b3d8bcfd0385f9888d7a1d7d04dbe4328c4ad4
+MISC metadata.xml 554 BLAKE2B b7e8a99695365047f82469d977834081f033f7742a56a376897455e1b87acbf305454088dc9102265747b67f327733a74386e2d0e04c2f8c6d521ad44bd40bee SHA512 4c226c8e6dc6effd387a8fd9af0c1f52b471e90c4fdca04d37b291fae787eaa7d390bca12c0a5095bc2a242ba32daf80005ac69ea48e3764a0685b1974c88301
diff --git a/app-misc/openastro/metadata.xml b/app-misc/openastro/metadata.xml
new file mode 100644
index 000000000000..8ee7525f685c
--- /dev/null
+++ b/app-misc/openastro/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <maintainer status="active">
+ <email>devel@openastro.org</email>
+ <name>Pelle van der Scheer</name>
+ </maintainer>
+ <bugs-to>https://bugs.launchpad.net/openastro.org</bugs-to>
+ </upstream>
+ <use>
+ <flag name="jpeg">Enable exporting Astrological Charts to jpeg</flag>
+ <flag name="png">Enable exporting Astrological Charts to png</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/openastro/openastro-1.1.56.ebuild b/app-misc/openastro/openastro-1.1.56.ebuild
new file mode 100644
index 000000000000..1a0a8770f703
--- /dev/null
+++ b/app-misc/openastro/openastro-1.1.56.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+
+inherit distutils-r1
+
+MY_PN=${PN}.org
+
+DESCRIPTION="A fully-featured Open Source Astrology Program"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg png"
+
+DEPEND="
+ app-misc/openastro-data[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pycairo[svg(+),${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pyswisseph[${PYTHON_USEDEP}]
+ gnome-base/librsvg:2[introspection]
+ x11-libs/gtk+:3[introspection]"
+RDEPEND="${DEPEND}
+ jpeg? ( media-gfx/imagemagick[jpeg,svg] )
+ png? ( media-gfx/imagemagick[png,svg] )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/pal-0.4.3-r2 b/app-misc/pal-0.4.3-r2
deleted file mode 100644
index fc5b7cb51619..000000000000
--- a/app-misc/pal-0.4.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses:0 sys-libs/readline:0 nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Command-line calendar program
-EAPI=6
-HOMEPAGE=http://palcal.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses:0 sys-libs/readline:0
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/palcal/pal-0.4.3.tgz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e prefix e51c7882b7b721e54e684f7eb143cbfe toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a2d7f4c0f1571122fbb124cced8d86f8
diff --git a/app-misc/pal/Manifest b/app-misc/pal/Manifest
new file mode 100644
index 000000000000..8af0ba8a699f
--- /dev/null
+++ b/app-misc/pal/Manifest
@@ -0,0 +1,8 @@
+AUX 0.4.3-ldflags.patch 188 BLAKE2B 2a691a724566b0f9e1303504cc7410e322a1b3dab1b6d34734a6e7b12b5102208180a6f5deb18908183dd75c3259c1dae9a0ab4b4cb768d286a34822fe0e85d2 SHA512 590852462185b57907c57f76bf76d7b4444e9deae8df85f66fc3aecee0b2539e41ce27f1097b7b24e12da46659bde163bb666317df8ec107cfbd6e26e1027d66
+AUX 0.4.3-strip.patch 300 BLAKE2B 404703b5eb2a6f014997cbef31d096017701c53791b6bffeb517a846683ca49a42b747395900f73fc3454f3e035a8779ba26099dd3bc9539162233460d7f93d4 SHA512 1ccf90c0c968e098fd1ad0dd61cc177ebc484ffa207b469b75aec63263dfb1cf9850218571b3f9609c4fea30c10678b115f24d78b4b17d0f57173712f7d5cf86
+AUX fix-Wformat-security-errors.patch 1909 BLAKE2B bd4b40533d3b9057a46f3b3c138777cc50138222a147f9d0987e4b0ad386fbb1dc8d9fa5b9aabd7e6685609ccc0dc73c353d24097ac5b6b7442a45149a0c20d9 SHA512 5c785d764afa40fe2a20ec489c8154bf6142c8aa13c71b3afbd09fac2f3b9d7cde26ab51bef02f6437037d48ef0054ecee1cc0d53db34a2492bd0f68300953a8
+AUX pal-0.4.3-pkg_config.patch 521 BLAKE2B c650d58ea769e0f1bfefd8987d9c856de56865982fc2965083eb1b8ad65799aa499506b356bcdafa5e272baee565e735c72076be5b930feba46d9a5be37b82e0 SHA512 216d34abd73cdfd7f539d4881c25717ae2bdf919df05ad553bf4ed3a0a8e8a616dcb688f06f6beee6b2f5943f3accf1d144ae3a226ee5a2d0078d5450640eaa5
+AUX pal-0.4.3-prefix.patch 1519 BLAKE2B 2f6c9bfddb55ff62caf49251e77b07890f8ed0231a2971b7a3c92e8f0dad92814399aeaf4b82d52a21ddae97a0c6058cf173c40e0c5bfcde62b5cb75bf63295e SHA512 428cc71d6775f33916e6b9025627027dc8b75fa66dadb4cef42b3e2167a662e04d94fff7edec68916efc3a1944f3579fa88e3324e0a131b7bc10d7f3105ea2c9
+DIST pal-0.4.3.tgz 130865 BLAKE2B 3d2629b534a644a3f760f64176340ffd73c0f33b6717e726662d6888a8007160a2978560f1e5f40140f128036e57a53e5b3c930fa07802f7170c1dc6fbce745d SHA512 8d543706e6dcabbdeb246ff18917b490da43c3211266dc67417906eb92602a107b066e2cb156da2b5362a19ac4992d1f21dc873485d3250912a53143f8257bf8
+EBUILD pal-0.4.3-r2.ebuild 1355 BLAKE2B 9dc141b143d013f416c33e0adf1402d297d68f9f788b194a318428c7e95f74b4aadc2c8a5e30d670fdc5c2f96c5c4120d4f3131100922ecee68430ae5ceaabdb SHA512 5c15a133be6a2adbaa5634128b4706e0f189942d102edb05450350b2b869e3e8e03f0fbca99953793149a44620f95699f3f0a5d8a3239db9fafb6b28df132d4d
+MISC metadata.xml 509 BLAKE2B ff194eb470c0d979c58220dee03a777d0ac4c80c7d33f8fdab5a51f89983a2bd6326dc955f62fa5960f31c31e0b7274e38543e97e05e48fbd6d870862899b980 SHA512 cea3652f00f870d6db65ed87bc3b37b429cc4d3c8cb91d40742ca0dda93961d14779d348a84fe43d432e5a8dd4deb67ae2439151a8cb5c249fcf3b4e4ed2dcb4
diff --git a/app-misc/pal/files/0.4.3-ldflags.patch b/app-misc/pal/files/0.4.3-ldflags.patch
new file mode 100644
index 000000000000..0bfd750ac5e7
--- /dev/null
+++ b/app-misc/pal/files/0.4.3-ldflags.patch
@@ -0,0 +1,8 @@
+--- a/src/Makefile.defs
++++ b/src/Makefile.defs
+@@ -25,4 +25,4 @@
+
+ CFLAGS = ${OPT}
+ CPPFLAGS = ${INCLDIR} ${DEFS}
+-LDFLAGS = ${LIBDIR} ${LIBS}
++LDFLAGS = ${LIBDIR} ${LIBS} ${LDOPT}
diff --git a/app-misc/pal/files/0.4.3-strip.patch b/app-misc/pal/files/0.4.3-strip.patch
new file mode 100644
index 000000000000..b3bfe3fd99f1
--- /dev/null
+++ b/app-misc/pal/files/0.4.3-strip.patch
@@ -0,0 +1,17 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -21,10 +21,10 @@
+ $(NAME): $(OBJ)
+ @echo " [gcc] $(NAME)"
+ @$(CC) $(CFLAGS) $(OBJ) $(LDFLAGS) -o $(NAME)
+-ifneq ($(DEBUG),1)
+- @echo " [strip] $(NAME)"
+- @strip $(NAME)
+-endif
++#ifneq ($(DEBUG),1)
++# @echo " [strip] $(NAME)"
++# @strip $(NAME)
++#endif
+
+
+
diff --git a/app-misc/pal/files/fix-Wformat-security-errors.patch b/app-misc/pal/files/fix-Wformat-security-errors.patch
new file mode 100644
index 000000000000..f1255d9e55f1
--- /dev/null
+++ b/app-misc/pal/files/fix-Wformat-security-errors.patch
@@ -0,0 +1,64 @@
+From 801804d5b1beca5f32dd78cd23e9f9e012ae0420 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 2 Aug 2016 10:07:39 -0400
+Subject: [PATCH 1/1] src/{input,output}.c: fix -Wformat-security errors.
+
+Newer versions of GCC have the ability to warn about insecure uses of
+format strings. These uses usually involve omitted "%s" format strings
+to the printf() family of functions, and when compiling with
+-Werror=format-security, they can cause the build to fail. This commit
+fixes a few such uses in input.c and output.c
+
+Gentoo-Bug: 521104
+---
+ src/input.c | 4 ++--
+ src/output.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/input.c b/src/input.c
+index 79db485..92bad36 100644
+--- a/src/input.c
++++ b/src/input.c
+@@ -463,7 +463,7 @@ static gboolean get_file_to_load(gchar* file, gchar* pal_file, gboolean show_err
+ return FALSE;
+ }
+ else
+- sprintf(pal_file, file);
++ sprintf(pal_file, "%s", file);
+ }
+
+ else
+@@ -618,7 +618,7 @@ GHashTable* load_files()
+ FILE* pal_file_handle = NULL;
+
+ if(!get_file_to_load(settings->pal_file, pal_file, FALSE))
+- sprintf(pal_file, settings->pal_file);
++ sprintf(pal_file, "%s", settings->pal_file);
+
+ pal_file_handle = get_file_handle(pal_file, TRUE);
+ if(pal_file_handle != NULL)
+diff --git a/src/output.c b/src/output.c
+index 97aaa0f..9806089 100644
+--- a/src/output.c
++++ b/src/output.c
+@@ -249,7 +249,7 @@ static void pal_output_text_week(GDate* date, gboolean force_month_label,
+ pal_output_fg(BRIGHT, color, utf8_buf);
+ }
+ else
+- g_print(utf8_buf);
++ g_print("%s", utf8_buf);
+
+
+ if(g_date_compare(date,today) == 0) /* make today bright */
+@@ -270,7 +270,7 @@ static void pal_output_text_week(GDate* date, gboolean force_month_label,
+
+ }
+ else
+- g_print(utf8_buf);
++ g_print("%s", utf8_buf);
+
+
+ /* print extra space between days */
+--
+2.7.3
+
diff --git a/app-misc/pal/files/pal-0.4.3-pkg_config.patch b/app-misc/pal/files/pal-0.4.3-pkg_config.patch
new file mode 100644
index 000000000000..2a299538e999
--- /dev/null
+++ b/app-misc/pal/files/pal-0.4.3-pkg_config.patch
@@ -0,0 +1,14 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2,9 +2,9 @@
+
+ include Makefile.defs
+
+-INCLDIR = -I${prefix}/include `pkg-config --cflags glib-2.0`
++INCLDIR = -I${prefix}/include $(shell ${PKG_CONFIG} --cflags glib-2.0)
+ LIBDIR =
+-LIBS = `pkg-config --libs glib-2.0` -lreadline -lncurses
++LIBS = $(shell ${PKG_CONFIG} --libs glib-2.0) -lreadline $(shell ${PKG_CONFIG} --libs ncurses)
+
+ SRC = main.c colorize.c output.c input.c event.c rl.c html.c latex.c \
+ add.c edit.c del.c remind.c search.c manage.c
diff --git a/app-misc/pal/files/pal-0.4.3-prefix.patch b/app-misc/pal/files/pal-0.4.3-prefix.patch
new file mode 100644
index 000000000000..08dfba41c7e7
--- /dev/null
+++ b/app-misc/pal/files/pal-0.4.3-prefix.patch
@@ -0,0 +1,44 @@
+--- a/src/Makefile.defs
++++ b/src/Makefile.defs
+@@ -3,7 +3,7 @@
+
+ # directory to install to. Depending on your distribution, you might
+ # want to change this to /usr/local
+-prefix = /usr
++prefix = @GENTOO_PORTAGE_EPREFIX@/usr
+ CC = gcc
+
+ PAL_VERSION = 0.3.5_pre1
+--- a/src/input.c
++++ b/src/input.c
+@@ -567,7 +567,7 @@
+ }
+
+ /* attempt to copy /etc/pal.conf to ~/.pal/pal.conf */
+- file = fopen("/etc/pal.conf", "r");
++ file = fopen("@GENTOO_PORTAGE_EPREFIX@/etc/pal.conf", "r");
+
+ /* if not found, try PREFIX/share/pal/pal.conf instead */
+ /* NOTE: This is will be removed in the future */
+@@ -577,7 +577,7 @@
+
+ if(file == NULL)
+ {
+- pal_output_error(_("ERROR: Can't open file: /etc/pal.conf\n"));
++ pal_output_error(_("ERROR: Can't open file: @GENTOO_PORTAGE_EPREFIX@/etc/pal.conf\n"));
+ pal_output_error(_("ERROR: Can't open file: " PREFIX "/share/pal/pal.conf\n"));
+ pal_output_error(_("ERROR: This indicates an improper installation.\n"));
+ return ht;
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -51,8 +51,8 @@
+ @echo " --- Installing global data --- "
+ @mkdir -p ${DESTDIR}${prefix}/share/pal;
+ install -m 0644 -o root ../share/*.pal ${DESTDIR}${prefix}/share/pal
+- @mkdir -p ${DESTDIR}/etc;
+- install -m 0644 -o root ../pal.conf ${DESTDIR}/etc/
++ @mkdir -p ${DESTDIR}@GENTOO_PORTAGE_EPREFIX@/etc;
++ install -m 0644 -o root ../pal.conf ${DESTDIR}@GENTOO_PORTAGE_EPREFIX@/etc/
+ @echo
+
+ # "install" will install the files needed by pal and also check to see
diff --git a/app-misc/pal/metadata.xml b/app-misc/pal/metadata.xml
new file mode 100644
index 000000000000..9c65100f6b4b
--- /dev/null
+++ b/app-misc/pal/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+<longdescription>
+ pal is a command-line calendar program for Unix/Linux systems that can keep
+ track of events. It has similarities with the Unix cal command, the more
+ complex GNU gcal program and the calendar program distributed with the BSDs.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">palcal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/pal/pal-0.4.3-r2.ebuild b/app-misc/pal/pal-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..4b730ffb3e7c
--- /dev/null
+++ b/app-misc/pal/pal-0.4.3-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit prefix toolchain-funcs
+
+DESCRIPTION="Command-line calendar program"
+HOMEPAGE="http://palcal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="nls"
+
+RDEPEND="
+ >=dev-libs/glib-2.0
+ nls? ( virtual/libintl )
+ sys-libs/ncurses:0
+ sys-libs/readline:0
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+RESTRICT="test" # Has no tests to run
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-strip.patch
+ "${FILESDIR}"/${PV}-ldflags.patch
+ "${FILESDIR}"/${P}-pkg_config.patch
+ "${FILESDIR}"/${P}-prefix.patch
+ "${FILESDIR}"/fix-Wformat-security-errors.patch
+)
+
+src_prepare() {
+ default
+
+ cd src || die "failed to change to the src directory"
+ eprefixify Makefile.defs input.c Makefile
+ sed -i -e 's/ -o root//g' {.,convert}/Makefile || die
+ tc-export PKG_CONFIG
+}
+
+src_compile() {
+ cd src || die "failed to change to the src directory"
+ emake CC="$(tc-getCC)" OPT="${CFLAGS}" LDOPT="${LDFLAGS}"
+}
+
+src_install() {
+ dodoc ChangeLog doc/example.css
+
+ cd src || die "failed to change to the src directory"
+ emake DESTDIR="${D}" install-man install-bin install-share
+
+ if use nls; then
+ emake DESTDIR="${D}" install-mo
+ fi
+}
diff --git a/app-misc/pax-utils-1.2.3 b/app-misc/pax-utils-1.2.3
deleted file mode 100644
index 2961ef8eb4c8..000000000000
--- a/app-misc/pax-utils-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug python seccomp
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e75fff8e55217dbefb7874eedd12720
diff --git a/app-misc/pax-utils-1.2.3-r1 b/app-misc/pax-utils-1.2.3-r1
deleted file mode 100644
index bc3b916094ce..000000000000
--- a/app-misc/pax-utils-1.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug python seccomp python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa49a3c5daed395637f1509478e4ea12
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
new file mode 100644
index 000000000000..6d7a9d04cb89
--- /dev/null
+++ b/app-misc/pax-utils/Manifest
@@ -0,0 +1,4 @@
+DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
+EBUILD pax-utils-1.2.3-r1.ebuild 1694 BLAKE2B fda1c5de05ca1629fa3699121784babbfa7ccd59e6c66589106fe6f7c9c0967e9789b92ce2132fc7faca9fc7cbb1a16924dcbb568c7c27f53f225879e96be790 SHA512 00f7db39f93f1905fa3978bf79dc13213347e4982a4062fd341b74e80b0af5fcf352cea1c9a0b2f24228b6a2f0b9fcbfee0c4ed541c2d858791de4b7bc0595a2
+EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
+MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
new file mode 100644
index 000000000000..a83679714a4e
--- /dev/null
+++ b/app-misc/pax-utils/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
+ <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription>
+ <use>
+ <flag name="python">Install a more powerful/faster version of lddtree</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..4d57eedb1532
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit eutils python-single-r1 toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pyelftools[${PYTHON_USEDEP}]
+ )
+ seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+ caps? ( virtual/pkgconfig )
+ seccomp? ( virtual/pkgconfig )
+ app-arch/xz-utils"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+ emake \
+ USE_CAP=$(usex caps) \
+ USE_DEBUG=$(usex debug) \
+ USE_PYTHON=$(usex python) \
+ USE_SECCOMP=$(usex seccomp) \
+ "$@"
+}
+
+src_configure() {
+ # Avoid slow configure+gnulib+make if on an up-to-date Linux system
+ if use prefix || ! use kernel_linux ||
+ has_version '<sys-libs/glibc-2.10'
+ then
+ econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+ else
+ tc-export CC PKG_CONFIG
+ fi
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake check
+}
+
+src_install() {
+ _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+ use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
new file mode 100644
index 000000000000..5aa96c1c5b57
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+ python? ( dev-python/pyelftools )
+ seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+ caps? ( virtual/pkgconfig )
+ seccomp? ( virtual/pkgconfig )
+ app-arch/xz-utils"
+
+_emake() {
+ emake \
+ USE_CAP=$(usex caps) \
+ USE_DEBUG=$(usex debug) \
+ USE_PYTHON=$(usex python) \
+ USE_SECCOMP=$(usex seccomp) \
+ "$@"
+}
+
+src_configure() {
+ # Avoid slow configure+gnulib+make if on an up-to-date Linux system
+ if use prefix || ! use kernel_linux || \
+ has_version '<sys-libs/glibc-2.10'
+ then
+ econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+ else
+ tc-export CC PKG_CONFIG
+ fi
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake check
+}
+
+src_install() {
+ _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+}
diff --git a/app-misc/pdfpc-4.1.1 b/app-misc/pdfpc-4.1.1
deleted file mode 100644
index a36ace58cc74..000000000000
--- a/app-misc/pdfpc-4.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Presenter console with multi-monitor support for PDF files
-EAPI=6
-HOMEPAGE=http://pdfpc.github.io
-IUSE=gstreamer
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.1.1.tar.gz -> pdfpc-4.1.1.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06b0fc2b078a15572027ebfab47580f0
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
new file mode 100644
index 000000000000..302a4e16023e
--- /dev/null
+++ b/app-misc/pdfpc/Manifest
@@ -0,0 +1,3 @@
+DIST pdfpc-4.1.1.tar.gz 96995 BLAKE2B f032cf0207cfb116ef98a171376d1cc80ae20f70eb7a63cf29dbd93e73c7bc1b0ef7638f9086d9908470d988830c4b420d9b96e7764af6219267d9ca6aad557a SHA512 51fa8e7743e02ba7e119dc86505f4513c174842a22d5755154775bd9abd945e7bcb9ba3c205cb27de25c38271762307136cb5370443131ea80cc0b9187e531bf
+EBUILD pdfpc-4.1.1.ebuild 1047 BLAKE2B 71e94a6c2e63ffaea3046a1426036ff859b2243f7b539a9239585de10a15d60810a1c7537e2f382ee763da14a0b58632a5f70d2bafb46fca772b838e0410891e SHA512 72167e26b6c82d643fb791bc19033d41df196d8f8ce3d5bb03ab5488785c0e3aec8f16c6d5d9e85fa23289bdd60d37e0fa59bf0060ee3c692c8b275c7b8b0002
+MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/metadata.xml b/app-misc/pdfpc/metadata.xml
new file mode 100644
index 000000000000..6476f3f1f07e
--- /dev/null
+++ b/app-misc/pdfpc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">pdfpc/pdfpc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/pdfpc/pdfpc-4.1.1.ebuild b/app-misc/pdfpc/pdfpc-4.1.1.ebuild
new file mode 100644
index 000000000000..23b43ab32420
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
+
+inherit vala cmake-utils
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="http://pdfpc.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gstreamer"
+
+RDEPEND="app-text/poppler[cairo]
+ dev-libs/glib:2
+ dev-libs/libgee:0.8
+ gnome-base/librsvg
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ sys-apps/dbus
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ $(vala_depend)"
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
+ vala_src_prepare
+}
+
+src_configure(){
+ local mycmakeargs=(
+ -DSYSCONFDIR="${EPREFIX}/etc"
+ -DMOVIES=$(usex gstreamer on off)
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-misc/perltrash-0.3-r1 b/app-misc/perltrash-0.3-r1
deleted file mode 100644
index 09f8e00f8569..000000000000
--- a/app-misc/perltrash-0.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Command-line trash can emulation
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=ftp://www.iq-computing.de/perltrash/perltrash-0.3.tar.bz2
-_md5_=f662737efc237931402bca1da52d3f06
diff --git a/app-misc/perltrash/Manifest b/app-misc/perltrash/Manifest
new file mode 100644
index 000000000000..c89c1c57c8d2
--- /dev/null
+++ b/app-misc/perltrash/Manifest
@@ -0,0 +1,3 @@
+DIST perltrash-0.3.tar.bz2 10871 BLAKE2B 958f071659140ac8fb048256eee1f539a3a2e017b670ec0c556f14ca000b1a63be050a95007db7cf554121cb5a07f61ae048432e57e927edcbab98f1fd4ea1c5 SHA512 610657a42be862c687caff4be5833e1ac629ec5869e6f7263cd96fa5f275b27aa435b1872737cf51afcc75083e4647fcdd3b7e3d1448039c78c1fc489c63492a
+EBUILD perltrash-0.3-r1.ebuild 421 BLAKE2B c72dfa80caef4263664bc5632f717ed73bb924eb44f1adfb18f7d77a8e88dfa27c433bb6db4ccddbd74eb2b164c2bfa4430eddb2d05fa733ff0d56069b4e5d6e SHA512 b0ae364c7e005ae095cf6f2d6eb399c69a9aaaa26e0de19defe69fdaaf28968437d3a9b2c61c6fa381ba8b97ab49a8df81f5b0166ea70f8978f81a7e7fdd6d31
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/perltrash/metadata.xml b/app-misc/perltrash/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/perltrash/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/perltrash/perltrash-0.3-r1.ebuild b/app-misc/perltrash/perltrash-0.3-r1.ebuild
new file mode 100644
index 000000000000..278d09b1c36b
--- /dev/null
+++ b/app-misc/perltrash/perltrash-0.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line trash can emulation"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="ftp://www.iq-computing.de/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+DOCS=( README.txt )
+
+src_install() {
+ newbin "${PN}.pl" "${PN}"
+}
diff --git a/app-misc/pet-0.2.3 b/app-misc/pet-0.2.3
deleted file mode 100644
index b279a8e08e0a..000000000000
--- a/app-misc/pet-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.9
-DESCRIPTION=Simple command-line snippet manager
-EAPI=6
-HOMEPAGE=https://github.com/knqyf263/pet
-IUSE=zsh-completion
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys zsh-completion? ( app-shells/zsh-completions )
-SLOT=0
-SRC_URI=https://github.com/knqyf263/pet/archive/v0.2.3.tar.gz -> pet-0.2.3.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chzyer/readline/archive/41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz -> github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz https://github.com/fatih/color/archive/9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz -> github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz https://github.com/google/go-github/archive/2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz -> github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz https://github.com/google/go-querystring/archive/53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz -> github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jroimartin/gocui/archive/ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz -> github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/b6acae516ace002cb8105a89024544a1480655a5.tar.gz -> github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz https://github.com/spf13/cobra/archive/63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz -> github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz https://github.com/spf13/pflag/archive/2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz -> github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz https://github.com/golang/appengine/archive/170382fa85b10b94728989dfcf6cc818b335c952.tar.gz -> github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
-_md5_=af41f51cda6e4a7aef854d748a0e1475
diff --git a/app-misc/pet-0.2.3-r1 b/app-misc/pet-0.2.3-r1
deleted file mode 100644
index b05e2294dea0..000000000000
--- a/app-misc/pet-0.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.9
-DESCRIPTION=Simple command-line snippet manager
-EAPI=6
-HOMEPAGE=https://github.com/knqyf263/pet
-IUSE=zsh-completion
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys zsh-completion? ( app-shells/zsh-completions )
-SLOT=0
-SRC_URI=https://github.com/knqyf263/pet/archive/v0.2.3.tar.gz -> pet-0.2.3.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chzyer/readline/archive/41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz -> github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz https://github.com/fatih/color/archive/9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz -> github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz https://github.com/google/go-github/archive/2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz -> github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz https://github.com/google/go-querystring/archive/53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz -> github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jroimartin/gocui/archive/ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz -> github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/b6acae516ace002cb8105a89024544a1480655a5.tar.gz -> github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz https://github.com/spf13/cobra/archive/63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz -> github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz https://github.com/spf13/pflag/archive/2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz -> github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz https://github.com/golang/appengine/archive/170382fa85b10b94728989dfcf6cc818b335c952.tar.gz -> github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
-_md5_=6155741056ef02547250e8cb6f394cc7
diff --git a/app-misc/pet-0.2.4 b/app-misc/pet-0.2.4
deleted file mode 100644
index 939b19f7f695..000000000000
--- a/app-misc/pet-0.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.9
-DESCRIPTION=Simple command-line snippet manager
-EAPI=6
-HOMEPAGE=https://github.com/knqyf263/pet
-IUSE=zsh-completion
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys zsh-completion? ( app-shells/zsh-completions )
-SLOT=0
-SRC_URI=https://github.com/knqyf263/pet/archive/v0.2.4.tar.gz -> pet-0.2.4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chzyer/readline/archive/41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz -> github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz https://github.com/fatih/color/archive/9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz -> github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz https://github.com/google/go-github/archive/2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz -> github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz https://github.com/google/go-querystring/archive/53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz -> github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jroimartin/gocui/archive/ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz -> github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/b6acae516ace002cb8105a89024544a1480655a5.tar.gz -> github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz https://github.com/spf13/cobra/archive/63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz -> github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz https://github.com/spf13/pflag/archive/2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz -> github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz https://github.com/golang/appengine/archive/170382fa85b10b94728989dfcf6cc818b335c952.tar.gz -> github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
-_md5_=3e6fac7d60f716f2498588c687767e82
diff --git a/app-misc/pet-0.3.0 b/app-misc/pet-0.3.0
deleted file mode 100644
index 729f2e0b0124..000000000000
--- a/app-misc/pet-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=dev-go/go-crypto:= dev-go/go-net:= dev-go/go-oauth2:= dev-go/go-protobuf:= dev-go/go-sys:= >=dev-lang/go-1.9
-DESCRIPTION=Simple command-line snippet manager
-EAPI=6
-HOMEPAGE=https://github.com/knqyf263/pet
-IUSE=zsh-completion
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-go/go-crypto:= dev-go/go-net:= dev-go/go-oauth2:= dev-go/go-protobuf:= dev-go/go-sys:= zsh-completion? ( app-shells/zsh-completions )
-SLOT=0
-SRC_URI=https://github.com/knqyf263/pet/archive/v0.3.0.tar.gz -> pet-0.3.0.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/briandowns/spinner/archive/48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz -> github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz https://github.com/chzyer/readline/archive/f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz -> github.com-chzyer-readline-f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/google/go-github/archive/e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz -> github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz https://github.com/google/go-querystring/archive/53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz -> github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jroimartin/gocui/archive/4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz -> github.com-jroimartin-gocui-4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz https://github.com/mattn/go-colorable/archive/167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz -> github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz -> github.com-nsf-termbox-go-88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/golang/appengine/archive/150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz -> github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz
-_eclasses_=golang-base d4e3a3f895016e5c9d7afb1a33e7cf3c golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
-_md5_=df51e1923796930c3c1899ba1384006f
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
new file mode 100644
index 000000000000..63ad19134861
--- /dev/null
+++ b/app-misc/pet/Manifest
@@ -0,0 +1,34 @@
+DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz 11663 BLAKE2B 17e4c4d8403663b27c85074f456c60f7da3d43c875816b6f4da32ccc4c422b59cb28c11a894705430b6001766ba3a63ddaade95ab1510f87ce19cfe0b1391d04 SHA512 9ba6de3249259ddbc81faef63e0c801822687f875acb5965dcdfd52c85bca887dd5248be731e0731f1dcf274de64a87630cb902fc2e15718ffb327922f023bea
+DIST github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz 35509 BLAKE2B 66c231463c6ab3a6f680e6f7359f5308d2c07cf41a445d106339a0b8f190b790c458e07715f1a2dc5febc86b8559d33f87d29554e6a4113b7de863f38fbc406c SHA512 44c70da26dff59e3ae264e9b586517327e1612d9e173d7d4a2dc50740a067bfb5af2dd9a6dceef86fa65bef719ae8dd443306078e02b2a06eefd9971896079fe
+DIST github.com-chzyer-readline-f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz 36845 BLAKE2B 2c99997fcbc05cf6eee1d8f5829b331d14d9981598a913832a71c58a19fa889a4b270df7f4612a0dff3eddc03dcf6d4be42c05f762010a9ed4f53817b0b61d86 SHA512 f8d2c9c40c594a3ac2724c7109eaf22b212b644c39846f6c86ee4199c61f7197b0e276dfefdd037accdbfdb24ddf850a2b3608fbaaeeca2048269c219dbf93cd
+DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
+DIST github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz 587208 BLAKE2B 9950f95e1d9bcac7e97e88d211ed0cce83ea3bb43808b70a7443d93f9d4f0c14c3714968b3c37dd703bd6cca1fa7c7f9d20966979b8b331469af40b712ee6131 SHA512 cc36bf9807a8f50951c9da6b49ced1f3b3fff8437371e8bb0fab5f56785f2e9c0bada77efe08107405f4a72f6d5b0e0fdd34be60498bd5e52d3cabe6c6cd2a7a
+DIST github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz 230977 BLAKE2B a551b24b20e846e81305181130bdf47af11ab0ce93d9b2c7a626df507c5eb8a88f416e919dfe7a9f73d47c606d34182a90a64e08b4279928a300bac664250368 SHA512 a1d337d50378604f28c275dc3192565a7b058ace04cfefa5b5cce7141873e88925b63750a9ba62e87e4b3e65f4c94875435674653836d8785c02b26f82a1ceb6
+DIST github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz 245917 BLAKE2B 28ebc8887957684a7d952300b3309d7846eb273945172c3ac833cd5fd7d947df35fb6f872afd4f18c4edffee5078c5833c85a9a7c2dca0c6c6d620e258752a2c SHA512 bf77e378486d96ac62353e2c92dae6e8e7a7daf59c26053fe66d455b2d3319101e217f0c8edb9f40ed7b00034537040a99eb96d1d9859e01794d07fd6d96d42f
+DIST github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz 169813 BLAKE2B 3bc9dd34e9c2626cacaf53dba8d173013ee3c0a4ecd376021c0fbe82463bd12382c515fb473ab423cdd2549b9ea62243719e332c1e7b64a0611439e7fc8d0787 SHA512 aaedfc089a6b1300e5c3a73fa634a982e5391463f7f594a4908cdd7c7e37c9626c7fecb2907e5bca067395fcb826001748fa1a84b3cb3ff59f8cf7006a4f6bd1
+DIST github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz 195878 BLAKE2B 46e186bc1a3096dd043780a35a989959b2cbcabd063bd4bd671fb3b4536ecff731037c57479228badb438fb53bb0c21e8fbb1db881f1438be9bd2398a75c9455 SHA512 da15b3ff93cc1b26439b9e7acf3ae5a12e7d23c0d6e11c691c4013133d37b41d35275f8040a74fcd4f90a9ad93c0b95b48687de43e94831b699df60fbf0c5159
+DIST github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz 7489 BLAKE2B 93ae5c6fc79a511852fa71da41cc9a53d4c93f9e7da43b4b105481f6d77efcbbf30379e7a90ba8e4330553956fa435e3d2e93d8865e7dfda293bbebe9b0ddfa1 SHA512 18830dbf6e14eb7757f7bdee1405e278b6c966fc7632be3decf34ea947705d66f8c0def8060371aa1e3c90cee7ca4324e67d9926627243f987281db52ffa2bca
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jroimartin-gocui-4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz 28059 BLAKE2B e760c6976b7cf6bf4df46bc355eb1ecbd62795d65ddc8172f4ee727579a5848f1e202afe9fa1fd649ab52c417af8f0c8aa09a139904a57114214859206404028 SHA512 27931ff511b9ddca3ad0f21d648ac4652736907366136d8e0282a89acf4afb589821aee0362166a8df2de2cbd6b20edf13c13d2686e6e5f9ea2d773e6e507b36
+DIST github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz 27556 BLAKE2B 0fa04ef876787441426eaa0801a04e82ef50dbe9a538652e75e74704ae5814e3171d5c82f77961b43b2d6409b0398a38f34193f5dab3ff2fb8b9a81fd54dd228 SHA512 70fbbc37ddae36769fd75d16c342fb41a19f0b7f09e3291fb8579afaa7f02962f7192d9030be4b35cce0fc847275ecad88121e254d28e963efa16a99cd42b41a
+DIST github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz 7598 BLAKE2B 21a5b6e25859f38416a185646e3d63cb7fc2d175f816ba71b924a80a939fdd47af5be8eec35146703822e1eaa91a3a2f41123eba475f678cd0206b597b879189 SHA512 47f401a01ecc8d08504bb8da3164b95c814ff567d9d44dcdd8aed7dcc2768e4aae0b65504f15931a20c3ec6bd9873383e2b1150660a7ae5016dc1d389305a0f9
+DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
+DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
+DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz 3323 BLAKE2B b7f8fcc57dd652cc4c320237e3287286aa3dfc8cd5d6115b49835a4fa7f1d507963feaaf0103712b03a0ae09195aa863da31caedef549d9b29dde9f0daf82ab3 SHA512 30ef451bf1f85c7489464e367a95a7f558c2c1a424ff49c5148393d631ceb98c58edef23fcb2b4f1bed0e7c1b3fdd8b5273874ba9304e6f29e83c0d9e127d34d
+DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
+DIST github.com-nsf-termbox-go-88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz 31339 BLAKE2B 38224fa7af5e8e56500fc01f3e861aeae2e81b4cc38859d9598b0883ccde7504f1f717a73db4a76c4ea4baa5f052fb5b7f39413aa8be9e5cde5b70d8693f2044 SHA512 f53f34059016336cdf2d061594b50ce5a3bad9a9a97158218342e245c277ae68571647fe00bf207274a8714ce103a536ff80b820feaefb44cbd12abc5debdd47
+DIST github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz 30244 BLAKE2B 1e770aaaa79326b3acbf4bd956924538411c8d805b6c213603106e6a87a6b4e4aaa6095033393a5b1437073004e2672596e55f6d1b4fe7e902c71237f192e2a0 SHA512 194ccef5dc9aee30422285bc752700d24b7dc05475dd5bce5023f8fe426257d0c3d75bde5c4a3681737b7604c944d964344f81c663a4ad180f9e41b70b1e81b5
+DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
+DIST github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz 74684 BLAKE2B 7c3809f3040dbf8872c6081afecb072ca198f8a22c89860edb452e55807a18dd41e2887911be4557448cd571d3db42493c7a5af2796bb8b9494ebd10822c00a6 SHA512 8919acb161f6f98e22f866726f3f85b4d5071782debe7117ad55c28508e469b73a2975d4660998a9df7a86472e8f65f2f103cf71c42d913d79a1bab6e86d94db
+DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
+DIST github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz 39235 BLAKE2B 743ad732b19efa4450b4a8a8512d51e03694592f9803233dfd946e7eaa513c8edf0e4b2763f458bae2e6af58a26a4d9559c54a35a0da6af9909d6b2b9b0a9624 SHA512 6bb7e34efe274e9a77fe95771ce8831a73537c5745f58ae62ec75a3744010752e1b4f3d1c35c689a41e1b0488a090224aaa3276f0981febd0838cf1a889be202
+DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
+DIST pet-0.2.3.tar.gz 2733693 BLAKE2B 92024983e2418c5c47f3a18ea664073fe847e2ef9be58ceb2d8e610cf8b9ac75a95d26a2512d26334c1cf989ad570fad83fe58ac7cd828740371c7276fd6855a SHA512 5207773b71ce773c974187cd86b8ddc7d1191f1baf615e035e290254d49d8c0ac4372b3ac004c0883a3fe7167447cab21e5b0711a78ce8ba57fcace975ef80a3
+DIST pet-0.2.4.tar.gz 2734689 BLAKE2B 2f6a4b0814cd69ec7b58f7a0892d955e8b4bc402c526c32b2b3240d7a883515b86b3f7d99a76bf58592eaa2eaf8f230889f0dd5ade6500506c217db68e6928cd SHA512 59b4c8f660fbcd208742e4c90a90c9eb4736d99631e14def5e8bdc1c75add2a6a67c358d2ec59ca816f6485d3d824bc6dc1592949889bace1734a5f2c3023e3d
+DIST pet-0.3.0.tar.gz 2735876 BLAKE2B c2b629db202c263b7419e79e15e07b808ea2a395030ef79214c541ac0d17a9fbe9cf3db9bc7e1a886da38ff8becd06d18abc24a69131cf6e3009ee2d72b1e6db SHA512 deb0323fbcd0195df9638bd82077a55be6554d80c44ddbb08cbb63c2a055659f5aa42fd87bc498d5cb0c93d57047f48462ec428ebff3d89a80dcd4b3661447fc
+EBUILD pet-0.2.3-r1.ebuild 2012 BLAKE2B 592a7253976aa5efbecc118306943712cd505c111bd2b573b1c6d0b939e283e7bd304694b3ff11d073eeb9867af7b7cb34fce3d1e2ec49b7c7e47c49f03fd885 SHA512 cfc5aabf28f43fbda06e8316e67b3522eeeb4a6c5caa8b78bc8e095e86a7f64e51577e30f9d8d174858dda1cb47c4a22b448c97bfe212e9dd3b59b5ce704e313
+EBUILD pet-0.2.3.ebuild 1988 BLAKE2B 4a8b7687f9f5009ca16fd4ef3673ee608da3f038f95684d3d90ec772843d1362d4b5146312538a139bd651bc199e3b06bf193a3b8bcbada66e9c5631ce3927f1 SHA512 5360ab9e5213cd89a2114617950c610a51e1d7002a0621e3431d50da1f5bb0f2b4dfae3e3a9d088883161880c78479b327a22df98215ad1e87f10906fb37e053
+EBUILD pet-0.2.4.ebuild 1998 BLAKE2B 317dfc8a59b15199cbddea040f1ac8c87bdc1d2b75ee8991c6aa447d0f80ceff70ca1ca9bc98dad3932d56a3bffce68f944bb9deacaeaef5c2d193748577a019 SHA512 2a7e813468571e3366402567eac5909568e2187cecc6b3baefb3189e9d7014ba436f563945d3dc12c784dcb306548d6e87c8552ed215451819951d30a679b6ed
+EBUILD pet-0.3.0.ebuild 2169 BLAKE2B c82ef596b6abfb64733fafce4a3538c0ee825f102b092b267592aeed9369171c73a0f5cad9e9f71ec4dc4069a5754f330824e788dbc27e756912d0f585a3440b SHA512 ea6141990ccd11c3498ae71f71d398c7f46c05a44cf9b9961781cf9e1ecc2a9e29af9a5c07eeda69fa7b6c3619b5f280a35eefc12e920ff17733d3b991c1e5a1
+MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
diff --git a/app-misc/pet/metadata.xml b/app-misc/pet/metadata.xml
new file mode 100644
index 000000000000..95a5086f8109
--- /dev/null
+++ b/app-misc/pet/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>spiderx@spiderx.dp.ua</email>
+ <name>Vladimir Pavljuchenkov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ A simple command-line snippet manager for rarely used commands.
+ It is capable: register command snippets, use variables in snippets,
+ search snippets interactively, run snippets directly,
+ edit snippets easily (config is just a TOML file),
+ sync snippets via Gist.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">knqyf263/pet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/pet/pet-0.2.3-r1.ebuild b/app-misc/pet/pet-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..1f1da8f503b4
--- /dev/null
+++ b/app-misc/pet/pet-0.2.3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+ "github.com/chzyer/readline 41eea22f717c616615e1e59aa06cf831f9901f35"
+ "github.com/fatih/color 9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"
+ "github.com/google/go-github 2966f2579cd93bc62410f55ba6830b3925e7629d"
+ "github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jroimartin/gocui ba396278de0a3c63658bbaba13d2d2fa392edb11"
+ "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+ "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+ "github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+ "github.com/nsf/termbox-go b6acae516ace002cb8105a89024544a1480655a5"
+ "github.com/spf13/cobra 63121c8814fc0b99184dbc1c8b7ef4fddae437c3"
+ "github.com/spf13/pflag 2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51"
+ "google.golang.org/appengine 170382fa85b10b94728989dfcf6cc818b335c952 github.com/golang/appengine" )
+
+EGO_PN="github.com/knqyf263/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+# dev-go/toml doesn't provide sources
+DEPEND="dev-go/glide
+ dev-go/go-crypto
+ dev-go/go-net
+ dev-go/go-oauth2
+ dev-go/go-protobuf
+ dev-go/go-sys"
+RDEPEND="${DEPEND}
+ zsh-completion? ( app-shells/zsh-completions )"
+
+src_install() {
+ dobin pet
+
+ if use zsh-completion ; then
+ insinto /usr/share/zsh/site-functions
+ doins src/github.com/knqyf263/pet/misc/completions/zsh/_${PN}
+ fi
+}
+
+pkg_postinstall() {
+ einfo "You should consider to install app-shells/peco to be able to use selector command"
+}
diff --git a/app-misc/pet/pet-0.2.3.ebuild b/app-misc/pet/pet-0.2.3.ebuild
new file mode 100644
index 000000000000..47ede51781c5
--- /dev/null
+++ b/app-misc/pet/pet-0.2.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+ "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+ "github.com/chzyer/readline 41eea22f717c616615e1e59aa06cf831f9901f35"
+ "github.com/fatih/color 9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"
+ "github.com/google/go-github 2966f2579cd93bc62410f55ba6830b3925e7629d"
+ "github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jroimartin/gocui ba396278de0a3c63658bbaba13d2d2fa392edb11"
+ "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+ "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+ "github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+ "github.com/nsf/termbox-go b6acae516ace002cb8105a89024544a1480655a5"
+ "github.com/spf13/cobra 63121c8814fc0b99184dbc1c8b7ef4fddae437c3"
+ "github.com/spf13/pflag 2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51"
+ "google.golang.org/appengine 170382fa85b10b94728989dfcf6cc818b335c952 github.com/golang/appengine"
+)
+
+EGO_PN="github.com/knqyf263/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="
+ ${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+# dev-go/toml doesn't provide sources
+DEPEND="
+ dev-go/glide
+ dev-go/go-crypto
+ dev-go/go-net
+ dev-go/go-oauth2
+ dev-go/go-protobuf
+ dev-go/go-sys"
+RDEPEND="${DEPEND}
+ zsh-completion? ( app-shells/zsh-completions )"
+
+src_install() {
+ dobin pet
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins misc/completions/zsh/_${PN}
+ fi
+}
+
+pkg_postinstall() {
+ einfo "You should consider to install app-shells/peco to be able to use selector command"
+}
diff --git a/app-misc/pet/pet-0.2.4.ebuild b/app-misc/pet/pet-0.2.4.ebuild
new file mode 100644
index 000000000000..baa71dab3843
--- /dev/null
+++ b/app-misc/pet/pet-0.2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+ "github.com/chzyer/readline 41eea22f717c616615e1e59aa06cf831f9901f35"
+ "github.com/fatih/color 9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"
+ "github.com/google/go-github 2966f2579cd93bc62410f55ba6830b3925e7629d"
+ "github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jroimartin/gocui ba396278de0a3c63658bbaba13d2d2fa392edb11"
+ "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+ "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+ "github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+ "github.com/nsf/termbox-go b6acae516ace002cb8105a89024544a1480655a5"
+ "github.com/spf13/cobra 63121c8814fc0b99184dbc1c8b7ef4fddae437c3"
+ "github.com/spf13/pflag 2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51"
+ "google.golang.org/appengine 170382fa85b10b94728989dfcf6cc818b335c952 github.com/golang/appengine" )
+
+EGO_PN="github.com/knqyf263/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+# dev-go/toml doesn't provide sources
+DEPEND="dev-go/go-crypto
+ dev-go/go-net
+ dev-go/go-oauth2
+ dev-go/go-protobuf
+ dev-go/go-sys"
+RDEPEND="${DEPEND}
+ zsh-completion? ( app-shells/zsh-completions )"
+
+src_install() {
+ dobin pet
+
+ if use zsh-completion ; then
+ insinto /usr/share/zsh/site-functions
+ doins src/github.com/knqyf263/pet/misc/completions/zsh/_${PN}
+ fi
+}
+
+pkg_postinstall() {
+ einfo "You should consider to install app-shells/peco to be able to use selector command"
+}
diff --git a/app-misc/pet/pet-0.3.0.ebuild b/app-misc/pet/pet-0.3.0.ebuild
new file mode 100644
index 000000000000..991478810dcf
--- /dev/null
+++ b/app-misc/pet/pet-0.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+ "github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
+ "github.com/chzyer/readline f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f"
+ "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+ "github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
+ "github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jroimartin/gocui 4f518eddb04b8f73870836b6d1941e8aa3c06637"
+ "github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
+ "github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+ "github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+ "github.com/nsf/termbox-go 88b7b944be8bc8d8ec6195fca97c5869ba20f99d"
+ "github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+ "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+ "github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+ "google.golang.org/appengine 150dc57a1b433e64154302bdc40b6bb8aefa313a github.com/golang/appengine" )
+
+EGO_PN="github.com/knqyf263/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+# dev-go/toml doesn't provide sources
+DEPEND="dev-go/go-crypto:=
+ dev-go/go-net:=
+ dev-go/go-oauth2:=
+ dev-go/go-protobuf:=
+ dev-go/go-sys:="
+RDEPEND="${DEPEND}
+ zsh-completion? ( app-shells/zsh-completions )"
+
+src_install() {
+ dobin pet
+
+ if use zsh-completion ; then
+ insinto /usr/share/zsh/site-functions
+ doins src/github.com/knqyf263/pet/misc/completions/zsh/_pet
+ fi
+}
+
+pkg_postinst() {
+ if ! has_version app-shells/peco ; then
+ einfo "You should consider to install app-shells/peco"
+ einfo "to be able to use selector command"
+ fi
+}
diff --git a/app-misc/pfm-2.12.3 b/app-misc/pfm-2.12.3
deleted file mode 100644
index 2a6bad2e9c79..000000000000
--- a/app-misc/pfm-2.12.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build(-)]
-DESCRIPTION=A terminal-based file manager written in Perl
-EAPI=5
-HOMEPAGE=http://p-f-m.sourceforge.net/
-KEYWORDS=amd64 s390 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8 >=dev-perl/File-Stat-Bits-1.10.0 >=dev-perl/HTML-Parser-3.59 >=dev-perl/libwww-perl-5.827 >=dev-perl/Term-ReadLine-Gnu-1.09 >=dev-perl/Term-Screen-1.30.0 >=dev-perl/Term-ScreenColor-1.130.0 sys-libs/ncurses sys-libs/readline >=virtual/perl-File-Temp-0.22 >=virtual/perl-Module-Load-0.16 dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/p-f-m/pfm-2.12.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-app 4b65c2afee485a204b0b22518141ae47 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=909948d185deba127b9cb586c847326e
diff --git a/app-misc/pfm/Manifest b/app-misc/pfm/Manifest
new file mode 100644
index 000000000000..3b382e633e3b
--- /dev/null
+++ b/app-misc/pfm/Manifest
@@ -0,0 +1,3 @@
+DIST pfm-2.12.3.tar.gz 2272053 BLAKE2B 257fb8b4682b884e1ee850668cc283cc1fc83d2cdc1366b5186fba6d71fa08b1f4c7d10123609c4bb8c79ab25f89c25994d749df098219efb9e9547e5e299d61 SHA512 d9feeaa95a0114ee513835a9273b62164a851ae8599d27575b3545f02144b4cf970a066afd5acec03092f0d49c85929c8127d1e134d1e80c15fe6d0a9b6921fc
+EBUILD pfm-2.12.3.ebuild 664 BLAKE2B f1a1c213046cf1413ff0a949d8efc84c0fa9ea7231bfa3696416b9d9322c1db3dbce0850d5128dfe4a9f095e2bd383c4130062f391437b06d4e38147c81cc503 SHA512 76dbd966ef5af47b14291035cb868a239d6d1f28926eeb9cc3fc1439b788e3f65b0ed0f254be7a6df3a18684a636546ea82ae8d7b0bd15b27407fb7609565877
+MISC metadata.xml 326 BLAKE2B ddedcf63628c21363e6b9f5835d5f3646c5ee32267dfe53390b4d7b9b69e6d7e7452503aef493d6814824904005ae5345cceac36abb750a97595a71069fecbd0 SHA512 74b827fb7bba6a09cbd67c07f3349b0e724bbda26f7b27cec24488a75d2dffc11415468c9bdbd12139115d8d40af137af10e51209200e5874b9f988cb27d7ce1
diff --git a/app-misc/pfm/metadata.xml b/app-misc/pfm/metadata.xml
new file mode 100644
index 000000000000..7c7d41faad7d
--- /dev/null
+++ b/app-misc/pfm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">p-f-m</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/pfm/pfm-2.12.3.ebuild b/app-misc/pfm/pfm-2.12.3.ebuild
new file mode 100644
index 000000000000..64c1eb47dd88
--- /dev/null
+++ b/app-misc/pfm/pfm-2.12.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-app
+
+DESCRIPTION="A terminal-based file manager written in Perl"
+HOMEPAGE="http://p-f-m.sourceforge.net/"
+SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 s390 x86"
+
+RDEPEND=">=dev-lang/perl-5.8
+ >=dev-perl/File-Stat-Bits-1.10.0
+ >=dev-perl/HTML-Parser-3.59
+ >=dev-perl/libwww-perl-5.827
+ >=dev-perl/Term-ReadLine-Gnu-1.09
+ >=dev-perl/Term-Screen-1.30.0
+ >=dev-perl/Term-ScreenColor-1.130.0
+ sys-libs/ncurses
+ sys-libs/readline
+ >=virtual/perl-File-Temp-0.22
+ >=virtual/perl-Module-Load-0.16"
diff --git a/app-misc/physlock-0.5 b/app-misc/physlock-0.5
deleted file mode 100644
index 10b50a016818..000000000000
--- a/app-misc/physlock-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=lightweight Linux console locking tool
-EAPI=5
-HOMEPAGE=https://github.com/muennich/physlock
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v0.5.tar.gz -> physlock-0.5.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d351768df469753b5a54431c56b5c1ba
diff --git a/app-misc/physlock-11-r1 b/app-misc/physlock-11-r1
deleted file mode 100644
index c16cdd3b2a47..000000000000
--- a/app-misc/physlock-11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/pam
-DESCRIPTION=lightweight Linux console locking tool
-EAPI=6
-HOMEPAGE=https://github.com/muennich/physlock
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v11.tar.gz -> physlock-11.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=78d8a68367ed86a5f3b845080c6be7f6
diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
new file mode 100644
index 000000000000..88ff6cbba328
--- /dev/null
+++ b/app-misc/physlock/Manifest
@@ -0,0 +1,5 @@
+DIST physlock-0.5.tar.gz 13547 BLAKE2B f45a69476beff2c86787efc6b41c1dc330284a4c212927b45938d0bc531cef53ff01845277dc273bb826533c46b689667162f25936bfd35fe670b5f3c2642627 SHA512 0e22d2c1093556e2ca52da4ee36e53a7eebf9c2cf8e10592c95971aa3479c3ee1a31b9d71e52fca715a483f22740f6cf9a3c167fb61e4c6034a2ecf900fd5f9d
+DIST physlock-11.tar.gz 13791 BLAKE2B 73ba9ad238a4566156144a7107018689996691d1a24bab44e9575067efe072cfb6181b409a81ebcad03d42a48ea94fe32fc738f2d730cb1fd0137b2455a5a74b SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938
+EBUILD physlock-0.5.ebuild 471 BLAKE2B 70adcf4d2e320869458473b88dfdd8a858f2aa8007654c10817285386b0b1311725c20605b8d59d9345d86acdf2338eb426a59dd423b824c27c5551501719dcd SHA512 743491ca82a6f0495b22c2356f8f27846cd27689f4b2e67473de54aa7551a46c7c1865d7a6b2a0c59bbf329f9323700973089403aabdf049aa3d0f1242c07f54
+EBUILD physlock-11-r1.ebuild 553 BLAKE2B 93be1c05c828d028f2176e32fac1723cbd065e6cf25c19c49eb9509bf3794e7310beaaebf0555f9087d818a7e9386a0de8f9bebe715f4a3c9492322a2b2c7080 SHA512 64d965a8fa93986b39ad74e313c4963bcaa342b7ac758532760db10de1375d2886b5f98dd43d19e7912fa6d93b5de8dacfe93e49de913ddcb0fe9e8757b68215
+MISC metadata.xml 757 BLAKE2B 91000aca8e366f965b46d72494b23734db9d5866c41f2f364755b9bf1397ce673ae96a8c182ee732ca3b05fae863cb8caaf61478f708df33ad3fe21e246b4af4 SHA512 34f57b70b867095ad5ddffad1a5a943488699e98495e98631dde72a96fca5260947bcece476e4411d146d6a1f72ed602401455d49343a4fa79faae77b5483625
diff --git a/app-misc/physlock/metadata.xml b/app-misc/physlock/metadata.xml
new file mode 100644
index 000000000000..3a7f9b503b95
--- /dev/null
+++ b/app-misc/physlock/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ Control physical access to a linux computer by locking all of its virtual
+ terminals / consoles.
+
+ physlock is an alternative to vlock, it is equivalent to `vlock -an'. It is
+ written because vlock blocks some linux kernel mechanisms like hibernate and
+ suspend and can therefore only be used with some limitations. physlock is
+ designed to be more lightweight, it does not have a plugin interface and it is
+ not started using a shell script wrapper.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">muennich/physlock</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/physlock/physlock-0.5.ebuild b/app-misc/physlock/physlock-0.5.ebuild
new file mode 100644
index 000000000000..f306ba46c194
--- /dev/null
+++ b/app-misc/physlock/physlock-0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="lightweight Linux console locking tool"
+HOMEPAGE="https://github.com/muennich/physlock"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+src_prepare() {
+ tc-export CC
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/app-misc/physlock/physlock-11-r1.ebuild b/app-misc/physlock/physlock-11-r1.ebuild
new file mode 100644
index 000000000000..761fce5332c0
--- /dev/null
+++ b/app-misc/physlock/physlock-11-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="lightweight Linux console locking tool"
+HOMEPAGE="https://github.com/muennich/physlock"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="virtual/pam"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+ dosym login /etc/pam.d/${PN}
+}
diff --git a/app-misc/pip-1.2-r2 b/app-misc/pip-1.2-r2
deleted file mode 100644
index 2fbe7e010246..000000000000
--- a/app-misc/pip-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-lang/perl[-build(-)]
-DESCRIPTION=Wrapper around programs that don't support stdin/stdout
-EAPI=5
-HOMEPAGE=http://membled.com/work/apps/pip/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=http://membled.com/work/apps/pip/pip-1.2.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-app 4b65c2afee485a204b0b22518141ae47 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b486b89a9a8b7761d179fed6af838eb2
diff --git a/app-misc/pip/Manifest b/app-misc/pip/Manifest
new file mode 100644
index 000000000000..97bfd7558277
--- /dev/null
+++ b/app-misc/pip/Manifest
@@ -0,0 +1,3 @@
+DIST pip-1.2.tar.bz2 17752 BLAKE2B e6a9c5467cfeae9a24d181fb16bd8dbb259250fb5f54add810f8e3fdce90d18c251a1c6e72e827b13dd52a40e578ac013d5e71725be7efac97944a6268237f13 SHA512 a09695a881585baea292d305c3e0dc4ed7d5ccc0cb8138f402d73e75bbc6d014e09c3b3091f6b92be97a8034c262bd98cebf71e08cc7c44e635483bb31a40a29
+EBUILD pip-1.2-r2.ebuild 594 BLAKE2B 0c98a4fa7e37beaa86d57a21fd93207c505ba1b4bb5ae15ad030050910d5739b40a9098b804b716e75280f8d7808190ea34081c78e2dd6bcb564591f837b8714 SHA512 8de15e038d81ed660c49ca6d6cc39eb4dca4b95da88270a5753ff7e41c2d722bd41bdf402f34a9e680fe077827056afab85e5091614118c19ab79b342d717c2a
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/pip/metadata.xml b/app-misc/pip/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/pip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/pip/pip-1.2-r2.ebuild b/app-misc/pip/pip-1.2-r2.ebuild
new file mode 100644
index 000000000000..4455eec5191e
--- /dev/null
+++ b/app-misc/pip/pip-1.2-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-app
+
+DESCRIPTION="Wrapper around programs that don't support stdin/stdout"
+HOMEPAGE="http://membled.com/work/apps/pip/"
+SRC_URI="http://membled.com/work/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_install() {
+ perl-module_src_install
+ mv "${ED}"/usr/bin/{pip,gpip} || die 'rename failed'
+}
+
+pkg_postinst() {
+ ewarn "To avoid collisions with dev-python/pip executable file of this package was renamed to 'gpip'"
+}
diff --git a/app-misc/pipeworks-0.4-r1 b/app-misc/pipeworks-0.4-r1
deleted file mode 100644
index ce3b70288a87..000000000000
--- a/app-misc/pipeworks-0.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A small utility that measures throughput between stdin and stdout
-EAPI=6
-HOMEPAGE=http://pipeworks.sourceforge.net/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pipeworks/pipeworks-0.4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=297301d9bf3ec8247376dc2342538364
diff --git a/app-misc/pipeworks/Manifest b/app-misc/pipeworks/Manifest
new file mode 100644
index 000000000000..b78348355c00
--- /dev/null
+++ b/app-misc/pipeworks/Manifest
@@ -0,0 +1,3 @@
+DIST pipeworks-0.4.tar.gz 11560 BLAKE2B ddc28cc26e4f6305eacf6f888cb11a205f1ec64b180a328dda7e250cfef8d98f52374301066ef844739f7f85a4d344307d21d4704c33f450db2740121a631182 SHA512 ddd9875deab26d0f0b673846c7838733a2c3ec573fbd06d85e4058adb3b0d5274daeac1165b573743b8b3da6aa05c24b9ecc0ac788b24a42cf0f379a8eb56ebd
+EBUILD pipeworks-0.4-r1.ebuild 643 BLAKE2B b228b66d2580a41acc8eb1a2c5cdbc27cda4b657458620750539fb0ca3820f56f9f95e4bfb455cd7a1315ed0106b13e2629d8c3b0f49ebe3b95b7ff478390898 SHA512 53c43ffbb4e601eddc4088f21cf089ec30d679686880e3a438579e62297f2ba261c195a4e99019dd68624105390d79624197ac15ec696239931c4bb433c1f17b
+MISC metadata.xml 520 BLAKE2B 7c3c2102bcdad8698d9970f496002e43a7b93a88368555cf4e6762e0752e1dc56df82b66d4560dccebfa4b1bfb817d2c975019946e269cf074871f184078baa5 SHA512 f95bd764a974893a6ec46c0761a8b7a5edbb467c5b393a771163e42451efb34d75e25b73efb984d960b0aa46f19c233a5fd2df1f90aafebf4365d425d63c7243
diff --git a/app-misc/pipeworks/metadata.xml b/app-misc/pipeworks/metadata.xml
new file mode 100644
index 000000000000..5fdc86c0a692
--- /dev/null
+++ b/app-misc/pipeworks/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription>
+pipeworks is a benchmarking tool for pipelines that is very similar to pipemeter. It writes its stdin to its
+stdout, while reporting the data flow rate to stderr. It features adjustable block size and bandwidth limiting
+capabilities.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">pipeworks</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
new file mode 100644
index 000000000000..c1cb72b55af3
--- /dev/null
+++ b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A small utility that measures throughput between stdin and stdout"
+HOMEPAGE="http://pipeworks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pipeworks/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+ dobin pipeworks || die "dobin failed"
+ doman pipeworks.1
+ dodoc Changelog README
+}
diff --git a/app-misc/plod-1.9-r2 b/app-misc/plod-1.9-r2
deleted file mode 100644
index ba7834456cb9..000000000000
--- a/app-misc/plod-1.9-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool to help administrators keep track of daily activities
-EAPI=6
-HOMEPAGE=http://www.deer-run.com/~hal/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-2 )
-SLOT=0
-SRC_URI=http://www.far2wise.net/plod/plod-1.9.tar.gz
-_md5_=2795d557d4162c6382c353a9f3326da7
diff --git a/app-misc/plod/Manifest b/app-misc/plod/Manifest
new file mode 100644
index 000000000000..f8839303a28f
--- /dev/null
+++ b/app-misc/plod/Manifest
@@ -0,0 +1,4 @@
+AUX plodrc 54 BLAKE2B 38a8751fb721690a46098b65f5cedff27cb4035124a4daeab32f2f76ea4f622718cf14915804e5b0d312d1432b521aee7dffbe3dbf79fb7dab66dce218317c28 SHA512 2ad257ddb80bc94cd53e83dbe861ada8ea583eb419472f4488b4b567effa33ea8ada8c450dcf08c42a84c8874e5db85f1c4076b96e2f6228d0b14937830bcec2
+DIST plod-1.9.tar.gz 29551 BLAKE2B 6aa0a5857ab1f29263393c63d8b122d6197c75abaa1579ceea5709a61a62e007238caee9aa0513e1e7ee50d0c34e5d478c8ff4014fa47e7b2f27dc05123f590f SHA512 0cf1365963ee0f5a8db445c16ce37890429a4c951ce547560e845316950b4f485ecdc0885e2d35cb240bf9d7bec587c0d913774b05cfca8a145c1837281cad88
+EBUILD plod-1.9-r2.ebuild 765 BLAKE2B 50e4f6e948f04dd1e8b12b14081ccccce16e5f9c2afbb30a2d09bc5c7e346bc0b815c07a4125e4781be0f2c3b0fcd23d663f1de67864acd468b28391a39d17aa SHA512 9382457e075d3f48eebdc881b229d3605a768ef9217c286151fc850bd09bd24ea6c4442b1c53060df3aa205db062874363728c0fa3cdad3cd63605761d63cbab
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/plod/files/plodrc b/app-misc/plod/files/plodrc
new file mode 100644
index 000000000000..9185f36eed5c
--- /dev/null
+++ b/app-misc/plod/files/plodrc
@@ -0,0 +1,2 @@
+# We don't use CRYPTCMD at default
+$CRYPTCMD = undef;
diff --git a/app-misc/plod/metadata.xml b/app-misc/plod/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/plod/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/plod/plod-1.9-r2.ebuild b/app-misc/plod/plod-1.9-r2.ebuild
new file mode 100644
index 000000000000..10ebf32c09e9
--- /dev/null
+++ b/app-misc/plod/plod-1.9-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to help administrators keep track of daily activities"
+HOMEPAGE="http://www.deer-run.com/~hal/"
+SRC_URI="http://www.far2wise.net/plod/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+ default
+
+ # Bug 619934. Change directories first to ensure that "unpack" outputs
+ # to ${S} and not to ${WORKDIR}.
+ cd "${S}" || die
+ unpack "${S}/${PN}.1.gz"
+}
+
+src_prepare() {
+ default
+ sed -i -e 's#/usr/local#/usr#' "${PN}" || die
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+
+ insinto /etc
+ doins "${FILESDIR}/${PN}rc"
+
+ dodoc README TODO
+}
diff --git a/app-misc/prog-express-3.7.8 b/app-misc/prog-express-3.7.8
deleted file mode 100644
index 1357946ea738..000000000000
--- a/app-misc/prog-express-3.7.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A modern and intuitive control software for the Batronix USB programming devices
-EAPI=6
-HOMEPAGE=https://www.batronix.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=prog-express
-RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
-SLOT=0
-SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.i386.deb )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 unpacker 87633b2194cdb56adaa1f5a5c8862c44
-_md5_=b5dcaab2c00936280c7b11b3bfecb944
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
new file mode 100644
index 000000000000..9916cdec6501
--- /dev/null
+++ b/app-misc/prog-express/Manifest
@@ -0,0 +1,5 @@
+AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
+DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
+DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
+EBUILD prog-express-3.7.8.ebuild 1573 BLAKE2B 7ea62d5ac6bdd72135934d7e19c851f0e73e87f7da8a229a6dce05bf965f4be129d3a11ef3e12c7ca44b456430e94b01cbdf4b5275d7ff009bad221db3aea440 SHA512 218576988462e71fb6aa0fb8aedd6894798323b00baf41bf91d21783d3a7a4bf29ceacdf75d7c6bb5adaf547bcbfe48dc28f05f7aec1a6e17df63126c8e5438c
+MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
diff --git a/app-misc/prog-express/files/pe.exe.config b/app-misc/prog-express/files/pe.exe.config
new file mode 100644
index 000000000000..56cb1a6e5193
--- /dev/null
+++ b/app-misc/prog-express/files/pe.exe.config
@@ -0,0 +1,3 @@
+<configuration>
+ <dllmap os="linux" dll="libusb-1.0.dll" target="libusb-1.0.so.0" />
+</configuration>
diff --git a/app-misc/prog-express/metadata.xml b/app-misc/prog-express/metadata.xml
new file mode 100644
index 000000000000..0a374610972e
--- /dev/null
+++ b/app-misc/prog-express/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Prog-Express is the programming device control software,
+ suitable for all USB programming devices of Batronix.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/prog-express/prog-express-3.7.8.ebuild b/app-misc/prog-express/prog-express-3.7.8.ebuild
new file mode 100644
index 000000000000..3cc76c3e2683
--- /dev/null
+++ b/app-misc/prog-express/prog-express-3.7.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop udev unpacker
+
+DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
+HOMEPAGE="https://www.batronix.com"
+SRC_URI="amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
+ x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="prog-express"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite:3
+ dev-dotnet/gtk-sharp:2
+ dev-dotnet/libgdiplus
+ dev-lang/mono
+ dev-lang/mono-basic
+ virtual/libusb:1
+ virtual/udev"
+
+S="${WORKDIR}"
+
+DOCS=( "usr/share/doc/prog-express/changelog" "usr/share/doc/prog-express/manuals" )
+
+QA_PREBUILT="usr/bin/bxusb
+ usr/bin/bxusb-gui
+ usr/bin/prog-express
+ usr/sbin/bxfxload"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
+
+ default
+}
+
+src_install() {
+ dobin usr/bin/bxusb usr/bin/bxusb-gui usr/bin/prog-express
+
+ dosbin usr/sbin/bxfxload
+
+ insinto /usr/lib
+ doins -r usr/lib/bxusb usr/lib/prog-express
+
+ insinto /usr/lib/prog-express
+ doins "${FILESDIR}"/pe.exe.config
+
+ udev_dorules lib/udev/rules.d/85-batronix-devices.rules
+
+ domenu usr/share/applications/prog-express.desktop
+
+ doicon usr/share/pixmaps/prog-express.png
+
+ doman usr/share/man/man1/bxfxload.1 usr/share/man/man1/bxusb.1 usr/share/man/man1/bxusb-gui.1 usr/share/man/man1/prog-express.1
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-misc/ps3pf_utils-2.3 b/app-misc/ps3pf_utils-2.3
deleted file mode 100644
index 02fd690f3ec0..000000000000
--- a/app-misc/ps3pf_utils-2.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utilities to set the ps3 specific features
-EAPI=0
-HOMEPAGE=http://www.playstation.com/ps3-openplatform/index.html
-KEYWORDS=~ppc ~ppc64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/people/geoff/cell/ps3-utils/ps3-utils-2.3.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ddcaf788367fd5f2bc1d08b79cc6fd28
diff --git a/app-misc/ps3pf_utils/Manifest b/app-misc/ps3pf_utils/Manifest
new file mode 100644
index 000000000000..062d49ba4778
--- /dev/null
+++ b/app-misc/ps3pf_utils/Manifest
@@ -0,0 +1,3 @@
+DIST ps3-utils-2.3.tar.bz2 351066 BLAKE2B 2168e6f2d0eb2543ee8efdf6092d9dd21d2bad38ad8459b19b9a2b4bbcc05874cb99768b6d2f090a5866b904c4a0fd5c590eb6ebc431f87fd3686d8a6fcc4adf SHA512 523e8c28325dc77478cc910a62249bfcd29b35b50e9b01d0d6dec600af302a4a3eff532b313d82fb23c4ff5436955629d8a72f1afb03b76f2b1b9cbd534e8396
+EBUILD ps3pf_utils-2.3.ebuild 571 BLAKE2B 5cac13fc988e7fe1f3476a77a0055e7592b54cfe80d04d438e08436d8d1bcdb454529bcb73c31f6427b1b3219db98a08bb9662a48a882e4827a3499320afd760 SHA512 c4718000f4b3a8174279d79746ea0c269de6867e962c0824ec5901c6686213496f6528df407be0cd7d6c3b193c823389e5d66128c899cf30a63c7f22cc532e31
+MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/app-misc/ps3pf_utils/metadata.xml b/app-misc/ps3pf_utils/metadata.xml
new file mode 100644
index 000000000000..5eb05198076b
--- /dev/null
+++ b/app-misc/ps3pf_utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
new file mode 100644
index 000000000000..f077de454c08
--- /dev/null
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit flag-o-matic
+
+DESCRIPTION="Utilities to set the ps3 specific features"
+HOMEPAGE="http://www.playstation.com/ps3-openplatform/index.html"
+SRC_URI="mirror://kernel/linux/kernel/people/geoff/cell/ps3-utils/ps3-utils-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64"
+IUSE=""
+
+# fixme: depend on a version of sys-kernel/linux-headers that supports ps3
+
+S=${WORKDIR}/ps3-utils-${PV}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
diff --git a/app-misc/pwsafe-0.2.0-r4 b/app-misc/pwsafe-0.2.0-r4
deleted file mode 100644
index 25d52a7881ef..000000000000
--- a/app-misc/pwsafe-0.2.0-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) readline? ( sys-libs/readline:0= ) X? ( x11-libs/libSM x11-libs/libICE x11-libs/libXmu x11-libs/libX11 )
-DESCRIPTION=A Password Safe compatible command-line password manager
-EAPI=6
-HOMEPAGE=http://nsd.dyndns.org/pwsafe/
-IUSE=X libressl readline
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) readline? ( sys-libs/readline:0= ) X? ( x11-libs/libSM x11-libs/libICE x11-libs/libXmu x11-libs/libX11 )
-SLOT=0
-SRC_URI=http://nsd.dyndns.org/pwsafe/releases/pwsafe-0.2.0.tar.gz
-_md5_=b4e15ec64f78637d06fb58a58ef5fd61
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
new file mode 100644
index 000000000000..a397e25836a8
--- /dev/null
+++ b/app-misc/pwsafe/Manifest
@@ -0,0 +1,8 @@
+AUX pwsafe-0.2.0-XChangeProperty.patch 1613 BLAKE2B 1a9ed912fe1581f7ed2006595801a881a5f9553319e73723d24203cecacab47ce76f5f661f03e73bd5066bd14ce78b38ea32a9dfdc080f75e506b32cf6558c70 SHA512 90329b172f6f1f9909c95c0cb648bb845c35e40ea78acf3d34c6ddfc1fae427694a5e0c2fa58de6a6614f432a81cdffe5b29e3a6211cae36924310ffc8b19680
+AUX pwsafe-0.2.0-cvs-1.57.patch 1100 BLAKE2B 66038b0d11f061509a3a6300837f72bec77de84d014e1b15b5b0cd6ea9d7dde0fe446276f5fad876ee53dcf48421f43cb7717f4a5179d171273f36cbecf03426 SHA512 3772c833b16b29c5119f11a7c106e4a7b2d4d3f8cf17d42c78f5403cd5ae92136dadc16c5cfcf961822db4c76f04946412637547173a26227761f74d83765330
+AUX pwsafe-0.2.0-fake-readline.patch 2667 BLAKE2B 297032d651ae485796fd4a213182416de6a6503816d9631b2d372efb2e0e81fe4c1e9371746a8e9cb050834884513a2892dafa730bd1ac599fcce1712358ad58 SHA512 466686d56662728c7c4d208ff69212daa84a86b746a9b4e52d48b2c7789d83fc1ad98673a8979a6f750c8215a0199e5580b5eb152b29e13761b1254eab30778e
+AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4b949bf5fd590eede9840dafb03e6df37cd961d867db9bd5cb3be15fb804961fd51d2ba6196d035ab18622a4d19e0f6882b9d980856 SHA512 17697927e64e5bcdbc68343775732e1559dd7fe5c000b15fda9af7229f3c2c36bbd4ee3af3c652da9e8d0550acd1b5bb39a75891f5f40c37640ea089a5b6306e
+AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
+DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
+EBUILD pwsafe-0.2.0-r4.ebuild 1017 BLAKE2B 8ab2711772f5f83105c7456a19f829a2cec02d077a9fe890df142d580ebc9ad9dfc914b9fc0cd40c4e1803fa8ae55aa1d9899d2d163f68c28dc5be60b37bc840 SHA512 3a58950a8f72c0696cdee221c63b75536bde0f5095b609dd260442ef204675ee7f673ce4d7e2d94a40c1094ef34039d141126f402c952274a36672e28acd657f
+MISC metadata.xml 868 BLAKE2B 4d255755c7ef0e69a916ec6bcac744805885da500e04cbc25822967abe5737379d5c4d46877fbdbfd4c0c166618a2c9a0237c3d7e8e595d1fc9b86e6a3a91bba SHA512 65c7ff9d5db3d2b16f5430344f944e042b27401be87183d7c6b761d95adefc5dee11dbf2d734675686cba48172276c3c70c7fd1f2c7d7d54303bc838a0817577
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-XChangeProperty.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-XChangeProperty.patch
new file mode 100644
index 000000000000..3fadfc2765fb
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-XChangeProperty.patch
@@ -0,0 +1,22 @@
+This patch came from <https://bugzilla.redhat.com/show_bug.cgi?id=667541>.
+
+Index: pwsafe.cpp
+===================================================================
+RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v
+retrieving revision 1.57
+diff -u -r1.57 pwsafe.cpp
+--- pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57
++++ pwsafe.cpp 5 Jan 2011 22:16:43 -0000
+@@ -1820,10 +1820,10 @@
+ if (xev.xselectionrequest.target == XA_TARGETS(xdisplay)) {
+ // tell them what we can supply
+ const Atom targets[] = { XA_TARGETS(xdisplay), XA_TIMESTAMP(xdisplay), XA_TEXT(xdisplay), XA_STRING };
+- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TARGETS(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0]));
++ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_ATOM, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0]));
+ }
+ else if (xev.xselectionrequest.target == XA_TIMESTAMP(xdisplay)) {
+- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TIMESTAMP(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&timestamp), 1);
++ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_INTEGER, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&timestamp), 1);
+ }
+ else if (xev.xselectionrequest.target == XA_TEXT(xdisplay) ||
+ xev.xselectionrequest.target == XA_STRING) {
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
new file mode 100644
index 000000000000..7f62eb59d429
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
@@ -0,0 +1,48 @@
+Index: pwsafe.cpp
+===================================================================
+RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v
+retrieving revision 1.56
+retrieving revision 1.57
+diff -u -r1.56 -r1.57
+--- pwsafe.cpp 30 Sep 2005 10:30:56 -0000 1.56
++++ pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57
+@@ -3346,6 +3346,12 @@
+ }
+
+ bufpos += rc;
++ buf[bufpos] = '\0';
++
++ if (rc == 0) {
++ // EOF (ctrl-D)
++ break;
++ }
+
+ if (bufpos == buflen && !strchr(buf,'\n')) {
+ // we needed a bigger buffer
+@@ -3354,6 +3360,7 @@
+ fprintf(stderr, "Error: %s out of memory\n", program_name);
+ memset(buf,0,buflen);
+ free(buf);
++ throw FailEx();
+ }
+
+ memcpy(new_buf, buf, bufpos);
+@@ -3364,9 +3371,15 @@
+ }
+ }
+
+- int len = strchr(buf,'\n') - buf;
+- saved.assign(buf+len+1, bufpos-(len+1));
+- buf[len] = '\0';
++ char* lf = strchr(buf,'\n');
++ if (lf) {
++ // save the rest of the input for later
++ saved.assign(lf+1);
++ *lf = '\0';
++ } else {
++ saved.assign("",0);
++ }
++
+ return buf;
+ }
+ #endif // WITH_READLINE
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-fake-readline.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-fake-readline.patch
new file mode 100644
index 000000000000..4e0f4ad4dfd6
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-fake-readline.patch
@@ -0,0 +1,107 @@
+Index: pwsafe.cpp
+===================================================================
+RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v
+retrieving revision 1.57
+diff -u -r1.57 pwsafe.cpp
+--- pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57
++++ pwsafe.cpp 30 Mar 2011 07:22:11 -0000
+@@ -3325,61 +3325,48 @@
+ static char* readline(const char* prompt) {
+ printf("%s", prompt);
+ fflush(stdout);
+-
+- static secstring saved;
+- int buflen = saved.length() + 100;
+- int bufpos = saved.length();
+- char* buf = reinterpret_cast<char*>(malloc(buflen+1));
+- if (!buf)
+- throw FailEx();
+- memcpy(buf, saved.data(), saved.length());
+- buf[saved.length()] = '\0';
+-
+- while (!strchr(buf,'\n')) {
+- const int rc = ::read(STDIN_FILENO, buf+bufpos, buflen);
+-
+- if (rc == -1) {
+- fprintf(stderr, "Error: %s read(STDIN) failed: %s\n", program_name, strerror(errno));
+- memset(buf,0,buflen);
+- free(buf);
+- throw FailEx();
+- }
+-
+- bufpos += rc;
+- buf[bufpos] = '\0';
+-
+- if (rc == 0) {
+- // EOF (ctrl-D)
+- break;
+- }
+-
+- if (bufpos == buflen && !strchr(buf,'\n')) {
+- // we needed a bigger buffer
+- char* new_buf = reinterpret_cast<char*>(malloc(2*buflen+1));
+- if (!new_buf) {
+- fprintf(stderr, "Error: %s out of memory\n", program_name);
+- memset(buf,0,buflen);
+- free(buf);
+- throw FailEx();
+- }
+
+- memcpy(new_buf, buf, bufpos);
+- memset(buf, 0, buflen);
+- free(buf);
+- buf = new_buf;
+- buflen *= 2;
+- }
+- }
++ size_t buflen = 100;
++ size_t bufpos = 0;
++ char* buf = static_cast<char*>(malloc(buflen+1));
++ if (!buf)
++ throw FailEx();
+
+- char* lf = strchr(buf,'\n');
+- if (lf) {
+- // save the rest of the input for later
+- saved.assign(lf+1);
+- *lf = '\0';
+- } else {
+- saved.assign("",0);
++ for (;;) {
++ const ssize_t rc = ::read(STDIN_FILENO, buf+bufpos, 1);
++ if (rc == -1) {
++ fprintf(stderr, "Error: %s read(STDIN) failed: %s\n", program_name, strerror(errno));
++ memset(buf,0,bufpos);
++ free(buf);
++ throw FailEx();
++ } else if (rc == 0) {
++ // EOF (ctrl-D)
++ break;
++ } else if (buf[bufpos] == '\n') {
++ // end of line
++ break;
++ }
++
++ ++bufpos;
++
++ if (bufpos == buflen) {
++ // we need a bigger buffer
++ char* new_buf = static_cast<char*>(malloc(2*buflen+1));
++ if (!new_buf) {
++ fprintf(stderr, "Error: %s out of memory\n", program_name);
++ memset(buf,0,bufpos);
++ free(buf);
++ throw FailEx();
++ }
++ memcpy(new_buf, buf, bufpos);
++ memset(buf, 0, bufpos);
++ free(buf);
++ buf = new_buf;
++ buflen *= 2;
++ }
+ }
+
++ buf[bufpos] = '\0';
+ return buf;
+ }
+ #endif // WITH_READLINE
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-man-page-option-syntax.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-man-page-option-syntax.patch
new file mode 100644
index 000000000000..a83d3a83d8eb
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-man-page-option-syntax.patch
@@ -0,0 +1,30 @@
+Index: pwsafe.1.in
+===================================================================
+RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.1.in,v
+retrieving revision 1.8
+diff -u -r1.8 pwsafe.1.in
+--- pwsafe.1.in 18 Mar 2006 14:17:41 -0000 1.8
++++ pwsafe.1.in 30 Mar 2011 07:42:23 -0000
+@@ -52,18 +52,18 @@
+ .B \-\-passwd
+ Change the database's passphrase.
+ .TP
+-.B \-\-list[=REGEX]
++.B \-\-list [REGEX]
+ List all [matching] entries in database.
+ .BR
+ If \-u or \-p is given then REGEX must match only one entry, and only the requested field(s) are emitted.
+ .TP
+-.B \-a, \-\-add[=NAME]
++.B \-a, \-\-add [NAME]
+ Add an entry to database.
+ .TP
+-.B \-e, \-\-edit=REGEX
++.B \-e, \-\-edit REGEX
+ Edit an entry.
+ .TP
+-.B \-\-delete=NAME
++.B \-\-delete NAME
+ Delete an entry from database.
+ .TP
+ If no command is given, an interactive mode is entered.
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-printf.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-printf.patch
new file mode 100644
index 000000000000..409f3a7220ed
--- /dev/null
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-printf.patch
@@ -0,0 +1,43 @@
+Index: pwsafe.cpp
+===================================================================
+RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v
+retrieving revision 1.57
+diff -u -r1.57 pwsafe.cpp
+--- pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57
++++ pwsafe.cpp 30 Mar 2011 05:44:07 -0000
+@@ -1619,7 +1619,7 @@
+ snprintf(ent_buf, sizeof(ent_buf), "%d", entropy_needed);
+ ent_buf[sizeof(ent_buf)-1] = '\0';
+ char len_buf[24];
+- snprintf(len_buf, sizeof(len_buf), "%d", pw.length());
++ snprintf(len_buf, sizeof(len_buf), "%lu", static_cast<unsigned long>(pw.length()));
+ len_buf[sizeof(len_buf)-1] = '\0';
+ switch (tolower(get1char("Use "+pw+"\ntype "+type_name+", length "+len_buf+", "+ent_buf+" bits of entropy [y/N/ /+/-/q/?] ? ", 'n'))) {
+ case 'y':
+@@ -2380,7 +2380,7 @@
+ version = VERSION_1_7;
+ }
+
+- if (arg_verbose > 1) printf("read in %u entries\n", entries.size());
++ if (arg_verbose > 1) printf("read in %lu entries\n", static_cast<unsigned long>(entries.size()));
+
+ opened = true;
+ return true;
+@@ -2601,7 +2601,7 @@
+ for (matches_t::const_iterator i=matches.begin(); i!=matches.end() && count < 3; ++i, ++count)
+ printf("%s%s", (count?", ":""), (*i)->groupname().c_str());
+ if (count != matches.size())
+- printf(", ... (%u more) ", matches.size()-3);
++ printf(", ... (%lu more) ", static_cast<unsigned long>(matches.size()-3));
+ printf(".\n");
+ throw FailEx();
+ }
+@@ -2637,7 +2637,7 @@
+ // print out the UUID too
+ fprintf(outfile, "%s\n", formatuuid(e.uuid).c_str());
+ if (!e.extras.empty())
+- fprintf(outfile, "and %u unknown extra fields\n", e.extras.size());
++ fprintf(outfile, "and %lu unknown extra fields\n", static_cast<unsigned long>(e.extras.size()));
+ }
+ } else
+ // just print out the name
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
new file mode 100644
index 000000000000..7eaa453dfe23
--- /dev/null
+++ b/app-misc/pwsafe/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chead@chead.ca</email>
+ <name>Christopher Head</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ pwsafe is a commandline password database utility compatible with
+ Counterpane's Password Safe. It is compatible with Counterpane Password
+ Safe 1.9.x and 2.0 databases. It can interact with X11 selection and
+ clipboard.
+ </longdescription>
+ <upstream>
+ <maintainer>
+ <email>ndade@nsd.dyndns.org</email>
+ <name>Nicolas Dade</name>
+ </maintainer>
+ <remote-id type="sourceforge">pwsafe</remote-id>
+ <remote-id type="github">nsd20463/pwsafe</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
new file mode 100644
index 000000000000..cd66440a6669
--- /dev/null
+++ b/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Password Safe compatible command-line password manager"
+HOMEPAGE="http://nsd.dyndns.org/pwsafe/"
+SRC_URI="http://nsd.dyndns.org/pwsafe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="X libressl readline"
+
+DEPEND="sys-libs/ncurses:0=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ readline? ( sys-libs/readline:0= )
+ X? ( x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libXmu
+ x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}/${P}-cvs-1.57.patch"
+ eapply -p0 "${FILESDIR}/${P}-printf.patch"
+ eapply -p0 "${FILESDIR}/${P}-fake-readline.patch"
+ eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch"
+ eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch"
+ eapply_user
+}
+
+src_configure() {
+ econf $(use_with X x) $(use_with readline)
+}
+
+src_install() {
+ doman pwsafe.1
+ dobin pwsafe
+ dodoc README NEWS
+}
diff --git a/app-misc/pysmssend-1.48-r2 b/app-misc/pysmssend-1.48-r2
deleted file mode 100644
index 4923ad183a64..000000000000
--- a/app-misc/pysmssend-1.48-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python Application for sending sms over multiple ISPs
-EAPI=6
-HOMEPAGE=http://pysmssend.silverarrow.org/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://pysmssend.silverarrow.org/files/pysmssend-1.48.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b0db142ec966494cd4998de28db5f29
diff --git a/app-misc/pysmssend/Manifest b/app-misc/pysmssend/Manifest
new file mode 100644
index 000000000000..9eb3d5355e18
--- /dev/null
+++ b/app-misc/pysmssend/Manifest
@@ -0,0 +1,3 @@
+DIST pysmssend-1.48.tar.gz 58172 BLAKE2B a1a33178505f3b9571c81ec90b2fc8c786ad988210c2d87f739d4b1c5c7df20bc1cc84e546a97c7a4b4063bbac363db93358c603994f99d216d1b6800c8d1c29 SHA512 d1d08e11bb4a5f450a98e9bf6292ce65edb61e0610e085dd79dcb80fd8ce1d15f7350797a0150eb6ddcc0116c17e3290f2790632eb7f54ab66efdcf662022088
+EBUILD pysmssend-1.48-r2.ebuild 737 BLAKE2B b093e9c364bf6f1771fd6da49f4a680828f8761e81f9db623ebb831b1e14a5b4ad2a82518e35cb6a116b57ae92d5b61b1feffd8a701e9a06572745f97a87941e SHA512 2a3709f00f7804c6b7c0609f1fdaabfd6c15da79d942542743927b355fa21b909fe3071611a2550720840d81e8a43f6ce0c4432ed5b84adcc7472a763018bf51
+MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
diff --git a/app-misc/pysmssend/metadata.xml b/app-misc/pysmssend/metadata.xml
new file mode 100644
index 000000000000..2028cee3c389
--- /dev/null
+++ b/app-misc/pysmssend/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/pysmssend/pysmssend-1.48-r2.ebuild b/app-misc/pysmssend/pysmssend-1.48-r2.ebuild
new file mode 100644
index 000000000000..9a6c08568a69
--- /dev/null
+++ b/app-misc/pysmssend/pysmssend-1.48-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Application for sending sms over multiple ISPs"
+HOMEPAGE="http://pysmssend.silverarrow.org/"
+SRC_URI="http://pysmssend.silverarrow.org/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">dev-python/mechanize-0.1.7b[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+python_install() {
+ distutils-r1_python_install
+ python_doscript pysmssendcmd
+ ln -s pysmssendcmd "${D}$(python_get_scriptdir)"/pysmssend || die
+}
+
+src_install() {
+ distutils-r1_src_install
+ dosym pysmssendcmd /usr/bin/pysmssend
+ einstalldocs
+}
diff --git a/app-misc/pystopwatch-2012.12.24.1-r1 b/app-misc/pystopwatch-2012.12.24.1-r1
deleted file mode 100644
index e6ac39431a74..000000000000
--- a/app-misc/pystopwatch-2012.12.24.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=clock and two countdown functions that can minimize to the tray
-EAPI=5
-HOMEPAGE=http://xyne.archlinux.ca/projects/pystopwatch
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/librsvg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://xyne.archlinux.ca/projects/pystopwatch/src/pystopwatch-2012.12.24.1.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7692ce55b5bf2de0af08b82bd0433739
diff --git a/app-misc/pystopwatch/Manifest b/app-misc/pystopwatch/Manifest
new file mode 100644
index 000000000000..1b8f0487289b
--- /dev/null
+++ b/app-misc/pystopwatch/Manifest
@@ -0,0 +1,3 @@
+DIST pystopwatch-2012.12.24.1.tar.xz 14580 BLAKE2B e9f6deabe932bb4adc658d5b5ebc0cc7f2de461a287773881c6d1f34e7f50a0b23b3b317344994a2717998fe6e611167ed0a5d380235f6b1a5e3f572964e7609 SHA512 4b3af373356eaafd14caeecb34150fef8e7099120855230dce7c0eabba68f75d497c3cc2eb733a086a02a96ae5feeca1898ba201a5f6f5597dcd32de9c80b3df
+EBUILD pystopwatch-2012.12.24.1-r1.ebuild 662 BLAKE2B 3fe88735f4eb936c4c6c8902e373f07da6430e69651fed927a2ff5c8994d4f566049f6935702b926f462833eee4c8a7f116e7ea802afca3f4d220e374c4c8bd3 SHA512 f77107c57ef88a9e6faaf8a26c024d5ad6e1405c67c3c54ce32cd085da1d7fa023a8d2f6e70277c408117c1c1c48749eabcadf93117666bbc9b3e207e18545e0
+MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-misc/pystopwatch/metadata.xml b/app-misc/pystopwatch/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/app-misc/pystopwatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
new file mode 100644
index 000000000000..8ef9462053b8
--- /dev/null
+++ b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="clock and two countdown functions that can minimize to the tray"
+HOMEPAGE="http://xyne.archlinux.ca/projects/pystopwatch"
+SRC_URI="http://xyne.archlinux.ca/projects/${PN}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ gnome-base/librsvg
+ ${PYTHON_DEPS}
+"
+DEPEND=""
+
+src_prepare() {
+ unpack ./man/${PN}.1.gz
+}
+
+src_install() {
+ python_doscript ${PN}
+ doman ${PN}.1
+}
diff --git a/app-misc/qlcplus-4.11.1 b/app-misc/qlcplus-4.11.1
deleted file mode 100644
index 4232f9102f6e..000000000000
--- a/app-misc/qlcplus-4.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare test unpack
-DEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=QLC+ - Q Light Controller Plus to control DMX interfaces
-EAPI=6
-HOMEPAGE=http://www.qlcplus.org/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
-SLOT=0
-SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.11.1.tar.gz -> qlcplus-4.11.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ef981a0b4f069198f49ec2663e36fca
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
new file mode 100644
index 000000000000..24618dea9b1a
--- /dev/null
+++ b/app-misc/qlcplus/Manifest
@@ -0,0 +1,3 @@
+DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
+EBUILD qlcplus-4.11.1.ebuild 1307 BLAKE2B 6b1d664e7370bb3e21465c8bed0b966e634d106797004f0997df552db14daec41f9f0b2a9a5d4d99a718c0248534416f4e8110c705b65771ee9ef755a74baf7c SHA512 1c8d14210707b7d758056bf80b5d1736db088cc46b0b1d790f4ffd8232eff307020a24d3b4038345e3943d0749ba40240a92b059e08a1089473c715040cec997
+MISC metadata.xml 326 BLAKE2B 8d391e1f300d364a5e985caad82387023c6f9d6081313b571ece49d2f5daf60f25527685bb7567ad18cbe3234202f8fe53b0a786b401477687b5b8ec39dfc1d9 SHA512 5de2dc43ec5ae4d9a2c598cfac00dc124a956040d0721cb867acc5c4ed312e8c9ef415205eaaed8ff5742281251c970a5ade2eae6280b62477f4fda3fedc2504
diff --git a/app-misc/qlcplus/metadata.xml b/app-misc/qlcplus/metadata.xml
new file mode 100644
index 000000000000..66cfad42c5fb
--- /dev/null
+++ b/app-misc/qlcplus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mcallegari/qlcplus</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
new file mode 100644
index 000000000000..db27fbd90c1b
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils udev vcs-snapshot virtualx xdg
+
+DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces"
+HOMEPAGE="http://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ || ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ media-libs/alsa-lib
+ media-libs/libmad
+ media-libs/libsndfile
+ sci-libs/fftw:3.0
+ virtual/libusb:0
+ virtual/libusb:1
+ virtual/udev
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
+ plugins/hid/hid.pro \
+ plugins/udmx/src/src.pro \
+ plugins/dmxusb/src/src.pro \
+ plugins/spi/spi.pro \
+ plugins/peperoni/unix/unix.pro || die
+ sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+ -i variables.pri || die
+}
+
+src_configure() {
+ eqmake5
+
+ # sandbox error "mkdir /usr/share/qlcplus"
+ # see https://bugs.gentoo.org/621500#c2
+ export INSTALL_ROOT="${D}"
+}
+
+src_test() {
+ virtx emake check
+}
diff --git a/app-misc/ranger-1.9.1 b/app-misc/ranger-1.9.1
deleted file mode 100644
index 5cf785c88396..000000000000
--- a/app-misc/ranger-1.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A vim-inspired file manager for the console
-EAPI=6
-HOMEPAGE=https://ranger.github.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3
-RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ranger/ranger/archive/v1.9.1.tar.gz -> ranger-1.9.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3cbcba8ce9027126a510d43de5505551
diff --git a/app-misc/ranger-9999 b/app-misc/ranger-9999
deleted file mode 100644
index cde0f7c3c50b..000000000000
--- a/app-misc/ranger-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A vim-inspired file manager for the console
-EAPI=6
-HOMEPAGE=https://ranger.github.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 git-r3 8f6de46b0aa318aea0e8cac62ece098b multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40da20f6f3abd0e13e18d99cc5b693a9
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
new file mode 100644
index 000000000000..b5458b628c6d
--- /dev/null
+++ b/app-misc/ranger/Manifest
@@ -0,0 +1,4 @@
+DIST ranger-1.9.1.tar.gz 245872 BLAKE2B 3ed48c4fe0cb42be7e001508a9c1f558e415e155eb5f68c9a8eb3e6d906ad287080391ab0310c0e9d67c9bc3210621827dc11107d99ac4173a4d8c64d74ab28b SHA512 c7fdc8f423860c7c420d7be61ebcc92629e444529c982f24260a9eeb68452adbbc6d40d53921c556da3d08a75b1c718bb05257cf869a15f7d932e8f00836cfe3
+EBUILD ranger-1.9.1.ebuild 1065 BLAKE2B 06dea5593b053c4c0d7647b1b38f43bc291d7c9be43794cc06427e43a40c4aaee0b0d72a6f6fee003df6a2c411775db366e7a7d455b0f213f21893a7c4bfa03e SHA512 a925b2488f4200635397ed3df7d6c05a6d689afec3faea143fe553532bb241eaa1783ca04525915a17afe34e294116a32f6c4bc95b71725bed06e3965b8c4a33
+EBUILD ranger-9999.ebuild 1067 BLAKE2B 23524c8eebfd5d84974df81e8ab781b155558563d42900d87145561f850e2f1433709f54387f91933ff92231342477df486f6bf79850126211aa36505abeaa62 SHA512 a669db30a0478fdeca3778054acccfce5e9cfb388b009d32afe15a3490f21e89fcf130c5f659b0d5e7a8f88001bdf48630572ac31314f02e1a01c2062c66ca65
+MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54
diff --git a/app-misc/ranger/metadata.xml b/app-misc/ranger/metadata.xml
new file mode 100644
index 000000000000..fa97c1a4914e
--- /dev/null
+++ b/app-misc/ranger/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <longdescription lang="en">
+ Ranger is a console file manager that gives you greater flexibility and a
+ good overview of your files without having to leave your console. It
+ visualizes the directory tree in two dimensions: the directory hierarchy on
+ one, lists of files on the other, with a preview to the right so you know
+ where you'll be going.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">ranger/ranger</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/ranger/ranger-1.9.1.ebuild b/app-misc/ranger/ranger-1.9.1.ebuild
new file mode 100644
index 000000000000..f5ec117b98ea
--- /dev/null
+++ b/app-misc/ranger/ranger-1.9.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ranger/ranger.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 ~ppc x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="https://ranger.github.io/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="virtual/pager"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+ # use versioned doc path
+ sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Ranger has many optional dependencies to support enhanced file previews."
+ elog "See the README or homepage for more details."
+ fi
+}
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
new file mode 100644
index 000000000000..363a06f282ac
--- /dev/null
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ranger/ranger.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="https://ranger.github.io/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="virtual/pager"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+ # use versioned doc path
+ sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Ranger has many optional dependencies to support enhanced file previews."
+ elog "See the README or homepage for more details."
+ fi
+}
diff --git a/app-misc/razertool-0.0.7-r4 b/app-misc/razertool-0.0.7-r4
deleted file mode 100644
index 176a6e3057c4..000000000000
--- a/app-misc/razertool-0.0.7-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/libusb:0 gtk? ( dev-libs/atk dev-libs/glib:2 >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 ) virtual/pkgconfig
-DESCRIPTION=Unofficial tool for controlling the Razer Copperhead mouse
-EAPI=6
-HOMEPAGE=http://razertool.sourceforge.net/
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 gtk? ( dev-libs/atk dev-libs/glib:2 >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/razertool/razertool_0.0.7.orig.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3812aa2eacc348ef60d693a8184439c6
diff --git a/app-misc/razertool/Manifest b/app-misc/razertool/Manifest
new file mode 100644
index 000000000000..f0a55d4ee910
--- /dev/null
+++ b/app-misc/razertool/Manifest
@@ -0,0 +1,3 @@
+DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
+EBUILD razertool-0.0.7-r4.ebuild 1764 BLAKE2B 27c58b0eb22bbd4f3a07b8922a1e1c5b8bedabe5a02958cf92e936bf96339a2e360b013fbe74db245b41f4f97667bfcb0e218805f76ac6fbede1c9cba36f1e8d SHA512 1c772f0b27c03f49462def5082bcc4f11a23760efcf41dd74f53085f7b8fe98aa290950312b4794c595df58107147c61dcfa89559b91749ecbd92173dc8d53f4
+MISC metadata.xml 669 BLAKE2B 033318e57004d253f5cd774cbe6163ef84e800a04c75c9115dff3877857e36d5062a0ea898fdabb2bdc5edbb3c3c3682989f76168051ea1cc1091b54c9c38749 SHA512 e14e8d1b8af18a78314722909095c39d5db6edc0c87a0eb15cff01afeebf7739e6d8eb5b96089ca4a4138b207d8de7a95e6dea76954bf4026682f65659403b12
diff --git a/app-misc/razertool/metadata.xml b/app-misc/razertool/metadata.xml
new file mode 100644
index 000000000000..314b4a229162
--- /dev/null
+++ b/app-misc/razertool/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
+ <longdescription>RazerTool is an unofficial tool for controlling Razer Copperhead(TM) mice in *nix. It has both command-line and gtk+-2.x versions. Allows to switch and alter profiles, upgrade firmware, ...</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">razertool</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r4.ebuild
new file mode 100644
index 000000000000..916571dbd9e0
--- /dev/null
+++ b/app-misc/razertool/razertool-0.0.7-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
+HOMEPAGE="http://razertool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="virtual/libusb:0
+ gtk? (
+ dev-libs/atk
+ dev-libs/glib:2
+ >=gnome-base/librsvg-2.0
+ >=x11-libs/cairo-1.0.0
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.8.0:2
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+ default
+
+ sed -i razertool.rules.example \
+ -e 's:ACTION=="add", ::;s:BUS=:SUBSYSTEMS=:;s:SYSFS{:ATTRS{:g' \
+ || die "sed razertool.rules.example action failed"
+
+ # plugdev group may not exist (created by hal), default to usb
+ sed -i razertool.rules.example \
+ -e 's:plugdev:usb:' \
+ || die "sed razertool.rules.example plugdev failed"
+}
+
+src_configure() {
+ econf $(use_enable gtk)
+}
+
+src_install() {
+ default
+
+ insinto /lib/udev/rules.d
+ newins razertool.rules.example 90-razertool.rules
+
+ # Icon and desktop entry
+ dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
+ make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
+}
+
+pkg_postinst() {
+ elog "Razer Copperhead mice need firmware version 6.20 or higher"
+ elog "to work properly. Running ${PN} on mice with older firmwares"
+ elog "might lead to random USB-disconnects."
+ elog "To run as non-root, add yourself to the usb group:"
+ elog " gpasswd -a <user> usb"
+ elog "or adapt permissions/owner/group in:"
+ elog " /etc/udev/rules.d/90-razertool.rules"
+ elog "Then unplug and plug in the mouse."
+}
diff --git a/app-misc/rbutil-1.4.0 b/app-misc/rbutil-1.4.0
deleted file mode 100644
index c938ec5d1966..000000000000
--- a/app-misc/rbutil-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/quazip dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtwidgets:5= media-libs/speex media-libs/speexdsp virtual/libusb:1 dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=Rockbox open source firmware manager for music players
-EAPI=6
-HOMEPAGE=https://www.rockbox.org/wiki/RockboxUtility
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/quazip dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtwidgets:5= media-libs/speex media-libs/speexdsp virtual/libusb:1
-SLOT=0
-SRC_URI=https://download.rockbox.org/rbutil/source/RockboxUtility-v1.4.0-src.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=521bc3761b43955e032aee15b8772e13
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
new file mode 100644
index 000000000000..2d3028feb209
--- /dev/null
+++ b/app-misc/rbutil/Manifest
@@ -0,0 +1,4 @@
+AUX quazip.patch 2401 BLAKE2B c011701e4f416289a5bfc681f2ce3184db091a744192e4b48ae9a42939e862739b030d88caff41a74c4b2ec5ad19e2e0bfa9c3ca0b9dc39f3413cbac41f06714 SHA512 34f2cb3d95ae3ed94adb25964f9009be8f5bab9a93df7ea993797065d297993d1f83a495eef9ee9c3339f8ba6f1e2b6778f8ecd667cf9538d84387373e7322dc
+DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe
+EBUILD rbutil-1.4.0.ebuild 1368 BLAKE2B ea42c5d6fb96eb01e93487f4e05a8747c9395cf033544a51b1b6f37474356af846aeed0b765c6ab0049b2cdf1230e90a10550a6d715545a2400c5f1bb1dbb759 SHA512 90867d25c0140517d1df46bd0fb78670a5a9e430bc935d91a0b475bce706c087749fe47f17ecac8a78807e60541ef4834943c2c4904e771406202568b105dda0
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/quazip.patch
new file mode 100644
index 000000000000..9d803712209e
--- /dev/null
+++ b/app-misc/rbutil/files/quazip.patch
@@ -0,0 +1,88 @@
+This patch is a simplified version of a patch I have sent upstream.
+http://gerrit.rockbox.org/1825
+
+-- Chewi
+
+diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
+--- a/base/ziputil.cpp 2014-01-05 22:44:53.000000000 +0000
++++ b/base/ziputil.cpp 2018-02-25 10:55:36.994002648 +0000
+@@ -22,9 +22,9 @@
+ #include "progressloggerinterface.h"
+ #include "Logger.h"
+
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+
+
+ ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
+diff -Naur a/base/ziputil.h b/base/ziputil.h
+--- a/base/ziputil.h 2014-01-05 22:44:54.000000000 +0000
++++ b/base/ziputil.h 2018-02-25 10:55:28.513838004 +0000
+@@ -21,9 +21,9 @@
+
+ #include <QtCore>
+ #include "archiveutil.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+
+ class ZipUtil : public ArchiveUtil
+ {
+diff -Naur a/rbutilqt.pri b/rbutilqt.pri
+--- a/rbutilqt.pri 2014-01-05 22:44:57.000000000 +0000
++++ b/rbutilqt.pri 2018-02-25 10:54:39.793852035 +0000
+@@ -69,12 +69,6 @@
+ base/rockboxinfo.cpp \
+ ../../tools/mkboot.c \
+ ../../tools/iriver.c \
+- quazip/quazip.cpp \
+- quazip/quazipfile.cpp \
+- quazip/quazipnewinfo.cpp \
+- quazip/unzip.c \
+- quazip/zip.c \
+- quazip/ioapi.c \
+ base/ziputil.cpp \
+ gui/comboboxviewdelegate.cpp \
+ gui/selectiveinstallwidget.cpp \
+@@ -156,14 +150,6 @@
+ base/rockboxinfo.h \
+ ../../tools/mkboot.h \
+ ../../tools/iriver.h \
+- quazip/crypt.h \
+- quazip/ioapi.h \
+- quazip/quazipfile.h \
+- quazip/quazipfileinfo.h \
+- quazip/quazip.h \
+- quazip/quazipnewinfo.h \
+- quazip/unzip.h \
+- quazip/zip.h \
+ base/ziputil.h \
+ lame/lame.h \
+ gui/comboboxviewdelegate.h \
+diff -Naur a/rbutilqt.pro b/rbutilqt.pro
+--- a/rbutilqt.pro 2014-01-05 22:45:00.000000000 +0000
++++ b/rbutilqt.pro 2018-02-25 10:55:04.577357613 +0000
+@@ -114,7 +114,7 @@
+
+ DEPENDPATH = $$INCLUDEPATH
+
+-LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR
++LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -lquazip5
+ # append all RBLIBS to LIBS
+ for(rblib, RBLIBS) {
+ LIBS += -l$$rblib
+@@ -122,7 +122,6 @@
+
+ # on win32 libz is linked implicitly.
+ !win32 {
+- LIBS += -lz
+ }
+
+ # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
diff --git a/app-misc/rbutil/metadata.xml b/app-misc/rbutil/metadata.xml
new file mode 100644
index 000000000000..54be7ff7e5d6
--- /dev/null
+++ b/app-misc/rbutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.0.ebuild
new file mode 100644
index 000000000000..0982dffdb4b5
--- /dev/null
+++ b/app-misc/rbutil/rbutil-1.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Rockbox open source firmware manager for music players"
+HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility"
+SRC_URI="https://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="dev-libs/quazip
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5=
+ dev-qt/qtwidgets:5=
+ media-libs/speex
+ media-libs/speexdsp
+ virtual/libusb:1"
+
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
+
+PATCHES=(
+ "${FILESDIR}"/quazip.patch
+)
+
+src_prepare() {
+ default
+ rm -rv quazip/ zlib/ || die
+}
+
+src_configure() {
+ # Generate binary translations.
+ lrelease ${PN}qt.pro || die
+
+ # noccache is required to call the correct compiler.
+ eqmake5 CONFIG+="noccache $(use debug && echo dbg)"
+}
+
+src_install() {
+ local icon size
+ for icon in icons/rockbox-*.png; do
+ size=${icon##*-}
+ size=${size%%.*}
+ newicon -s "${size}" "${icon}" rockbox.png
+ done
+
+ dobin RockboxUtility
+ make_desktop_entry RockboxUtility "Rockbox Utility" rockbox
+ dodoc changelog.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-misc/realpath-1.17 b/app-misc/realpath-1.17
deleted file mode 100644
index b8c277074406..000000000000
--- a/app-misc/realpath-1.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) elibc_mintlib? ( virtual/libiconv )
-DESCRIPTION=Return the canonicalized absolute pathname
-EAPI=4
-HOMEPAGE=http://packages.debian.org/unstable/utils/realpath
-IUSE=nls
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.17.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.17_i386.deb )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbab2458c4de15e52a28d14270843ba5
diff --git a/app-misc/realpath-1.18 b/app-misc/realpath-1.18
deleted file mode 100644
index 36d69ec20fbc..000000000000
--- a/app-misc/realpath-1.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) elibc_mintlib? ( virtual/libiconv )
-DESCRIPTION=Return the canonicalized absolute pathname
-EAPI=5
-HOMEPAGE=http://packages.debian.org/unstable/utils/realpath
-IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.18.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.18_i386.deb )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d60d0901c38ed15fd71e7467a5860948
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
new file mode 100644
index 000000000000..6c501928b72f
--- /dev/null
+++ b/app-misc/realpath/Manifest
@@ -0,0 +1,11 @@
+AUX realpath-1.14-no-po4a.patch 288 BLAKE2B cafe4fc0db905b3f9af36b256e392196bc37f1ec01150007590e022a231e38bbe89439419ccbbcb04c23154a2d43159bbe1e81d229d41fa0a8f24365f5849158 SHA512 db19ebcab412ee5b4229657e9745a76b8ad83bff70e3f8f6b939edfbff3aa389436d10fd7d8641bf6a0747630c2d1afcc3ff0d6fe2faeec55e8d4f4a79596cc6
+AUX realpath-1.15-prefix.patch 1443 BLAKE2B 3c62720d908dcb7ab29291e4029dd1923c2114649cc1c115e097e72193a4e9c1734a596434383b67b186796e605323f579e47c5f80ef9138f7556c9b9b965f70 SHA512 0e4980d60a4fff42823443ee9b8e9ef49a4f34ed031a3b01849f2d87b893f7205a4b7de2d6e090770aa2a3f7a31aab8f47d4f99c79d02d03fd5105001fdbcc5a
+AUX realpath-1.16-nonls.patch 685 BLAKE2B 84e67f77ef5263e860dd74b665377279b81853b9a9bff7266e2902673f6d86344ad79b3cbfcb42454a536879d696d32c86b3b895a478f13f8385900c1f931a47 SHA512 b27e44c1313e2c0dd0dfed719c373a3fc6f907a44cd1a9457c03bf1d83ce55b2aafefae84d2053f358e7dfe99dd7e4274137082c64c748e34680f324fe676719
+AUX realpath-1.17-build.patch 1161 BLAKE2B cd5821e86f048bae80b224b8db2322170e40638fcbe2d4582a2f21ef6a5218a576528446422d8363ca2e6b4a7cf209de9ff355ab229a683382d095436a22845a SHA512 507df6759deaf43c7973c8d9bb1faeffc22003308cd2fc4f73270eac9ba347e605093f55110b5c86170597eba4f2c80ea7d15b5ccab4b3d0b75dcef09203c09f
+DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c9493fa0148de6f14ad18dfa2ef05557932dec95a8b734b5d78881f0e239be41cba7bdaf4e353c092093ada3d SHA512 d4f8105e9256b140918dfa400eaac07bec9c29bced7284ab2a3a96282b13b59dca32ab0af38836dfe89dd4e3bf8b038ef4cf61a96d19951f46ac13264ceeec96
+DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
+DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
+DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
+EBUILD realpath-1.17.ebuild 1922 BLAKE2B 47b234acc39bbe0d97ae1f540d6ceded6a4c7e41b192148b9579820ae5e28f6a60c78a71b33d0d711b52d338ae8c986d97d25d3e5d99cc5883c46f0056391b2b SHA512 579835cba0c03d19591f319471876b16e077b15a1992a58ff264fcc74d77633d889c04c6979a457300ea453b8053b102a415ad50af33aa019aaf9fae858af2a9
+EBUILD realpath-1.18.ebuild 1945 BLAKE2B 6e721f5da530f526de29477622142ea5cba0bf7b3ec9f6613887ff2de9eb12ddc101aae1209d5ba1336b71ac83db6fa183bcad924bf1bacf2ef9e8b56d729a79 SHA512 62490cc44d6c749d6e541ca5696bef17185c38453e24180ab992a16f2ff7000db492ee15309593dc27394ea7ed8e14e3d9ddaa65764b6c824e5124e4921d7ca0
+MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/files/realpath-1.14-no-po4a.patch b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
new file mode 100644
index 000000000000..cfa780553646
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
@@ -0,0 +1,12 @@
+Don't require po4a at build time.
+http://bugs.gentoo.org/269905
+
+--- realpath-1.14-orig/po/Makefile 2009-02-22 12:56:47.000000000 +0100
++++ realpath-1.14/po/Makefile 2009-05-19 23:45:26.000000000 +0200
+@@ -4,5 +4,5 @@
+ #
+
+ ALL_TARGET=
+-SUBDIRS=bin man
++SUBDIRS=bin
+ include ../common.mk
diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch
new file mode 100644
index 000000000000..f9534641382f
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.15-prefix.patch
@@ -0,0 +1,39 @@
+diff --git a/common.mk b/common.mk
+index 2443a40..0a342ee 100644
+--- a/common.mk
++++ b/common.mk
+@@ -8,17 +8,19 @@ override TOPDIR := $(dir $(call getCurrentMakefileName))
+
+ override PACKAGE := realpath
+
+-PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH)
++#PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH)
++
++SHELL := @GENTOO_PORTAGE_EPREFIX@/bin/bash
+
+ # build abstraction
+-install_file := install -p -o root -g root -m 644
+-install_script := install -p -o root -g root -m 755
+-install_dir := install -d -o root -g root -m 755
++install_file := install -p -m 644
++install_script := install -p -m 755
++install_dir := install -d -m 755
+ install_link := ln -sf
+ compress := gzip -9f
+
+-prefix := /usr
+-etcdir := /etc/$(PACKAGE)
++prefix := @GENTOO_PORTAGE_EPREFIX@/usr
++etcdir := @GENTOO_PORTAGE_EPREFIX@/etc/$(PACKAGE)
+ bindir := $(prefix)/bin
+ sbindir := $(prefix)/sbin
+ mandir := $(prefix)/share/man
+@@ -33,7 +35,7 @@ webdocrootdir := /var/www
+ webcgidir := $(prefix)/lib/cgi-bin
+ applicationsdir := $(prefix)/share/applications
+
+-PERL := /usr/bin/perl
++PERL := @GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
+ CC ?= gcc
+ CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
+ LDFLAGS +=
diff --git a/app-misc/realpath/files/realpath-1.16-nonls.patch b/app-misc/realpath/files/realpath-1.16-nonls.patch
new file mode 100644
index 000000000000..d758d03ff89b
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.16-nonls.patch
@@ -0,0 +1,29 @@
+ src/realpath.c | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/src/realpath.c b/src/realpath.c
+index 76fc909..e2cf86f 100644
+--- a/src/realpath.c
++++ b/src/realpath.c
+@@ -23,10 +23,9 @@
+ #include <errno.h>
+ #include <getopt.h>
+ #include <stdarg.h>
+-#include <libintl.h>
+ #include <locale.h>
+
+-#define _(String) gettext (String)
++#define _(String) (String)
+
+ static char *stripdir(char * dir, char *buf, int maxlen);
+
+@@ -116,9 +115,6 @@ int main(int argc, char **argv) {
+
+ myname = ( p = strchr(argv[0], '/') ) ? p+1 : argv[0];
+
+- setlocale(LC_ALL, "");
+- bindtextdomain(PACKAGE, LOCALEDIR);
+- textdomain(PACKAGE);
+
+
+ parse_options(argc, argv);
diff --git a/app-misc/realpath/files/realpath-1.17-build.patch b/app-misc/realpath/files/realpath-1.17-build.patch
new file mode 100644
index 000000000000..c4a8b3dfc9b9
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.17-build.patch
@@ -0,0 +1,43 @@
+--- a/common.mk
++++ b/common.mk
+@@ -33,16 +33,9 @@
+ applicationsdir := $(prefix)/share/applications
+
+ PERL := /usr/bin/perl
+-CC := gcc
+-CFLAGS += $(CPPFLAGS) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
+-LIBS :=
+-
+-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+- CFLAGS += -O0
+-else
+- CFLAGS += -O2
+-endif
+-
++CC ?= gcc
++CFLAGS += $(CPPFLAGS) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
++LIBS +=
+
+ # determine our version number
+ ifndef VERSION
+@@ -58,9 +51,6 @@
+ unexport CDPATH ENV
+
+ ifdef DESTDIR
+- ifneq ($(DESTDIR),$(abspath $(DESTDIR)))
+- $(error DESTDIR "$(DESTDIR)" is not an absolute path)
+- endif
+ override ddirshort := DESTDIR
+ export ddirshort
+ endif
+@@ -108,7 +99,9 @@
+ esac; fi;
+ endef
+ else
+- msg := :
++ define msg
++ :
++ endef
+ endif
+
+ msgprefix := *$(subst * ,*,$(wordlist 1,$(MAKELEVEL),* * * * * * * * * * * * * * * * * *))
diff --git a/app-misc/realpath/metadata.xml b/app-misc/realpath/metadata.xml
new file mode 100644
index 000000000000..b701221db411
--- /dev/null
+++ b/app-misc/realpath/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ The realpath utility finds the canonicalized absolute pathname of its
+ arguments in a similar way to readlink -f.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
new file mode 100644
index 000000000000..633e771f4bdf
--- /dev/null
+++ b/app-misc/realpath/realpath-1.17.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs flag-o-matic multilib prefix
+
+DESCRIPTION="Return the canonicalized absolute pathname"
+HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
+SRC_URI="
+ mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
+ nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="!sys-freebsd/freebsd-bin
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ elibc_mintlib? ( virtual/libiconv )"
+
+src_unpack() {
+ unpack ${PN}_${PV}.tar.gz
+
+ if use nls; then
+ # Unpack the .deb file, in order to get the preprocessed man page
+ # translations. This way we avoid a dependency on app-text/po4a.
+ mkdir deb
+ cd deb
+ unpack ${PN}_${PV}_i386.deb
+ unpack ./data.tar.gz
+ fi
+}
+
+src_prepare() {
+ use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
+ epatch "${FILESDIR}"/${PN}-1.17-build.patch
+ epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch
+ epatch "${FILESDIR}"/${PN}-1.15-prefix.patch
+ eprefixify common.mk
+}
+
+src_compile() {
+ tc-export CC
+ use nls && use !elibc_glibc && append-libs -lintl
+ [[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
+
+ local subdir
+ for subdir in src man $(usex nls po ''); do
+ emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir}
+ done
+}
+
+src_install() {
+ emake VERSION="${PV}" SUBDIRS="src man $(usex nls po '')" \
+ DESTDIR="${D}" install
+ newdoc debian/changelog ChangeLog.debian
+
+ if use nls; then
+ local dir
+ for dir in "${WORKDIR}"/deb/usr/share/man/*; do
+ [ -f "${dir}"/man1/realpath.1 ] || continue
+ newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
+ done
+ fi
+}
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
new file mode 100644
index 000000000000..34ce163c9a33
--- /dev/null
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix toolchain-funcs
+
+DESCRIPTION="Return the canonicalized absolute pathname"
+HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
+SRC_URI="
+ mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
+ nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="
+ !sys-freebsd/freebsd-bin
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ elibc_mintlib? ( virtual/libiconv )"
+
+src_unpack() {
+ unpack ${PN}_${PV}.tar.gz
+
+ if use nls; then
+ # Unpack the .deb file, in order to get the preprocessed man page
+ # translations. This way we avoid a dependency on app-text/po4a.
+ mkdir deb
+ cd deb
+ unpack ${PN}_${PV}_i386.deb
+ unpack ./data.tar.gz
+ fi
+}
+
+src_prepare() {
+ use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
+ epatch \
+ "${FILESDIR}"/${PN}-1.17-build.patch \
+ "${FILESDIR}"/${PN}-1.14-no-po4a.patch \
+ "${FILESDIR}"/${PN}-1.15-prefix.patch
+ eprefixify common.mk
+}
+
+src_compile() {
+ tc-export CC
+ use nls && use !elibc_glibc && append-libs -lintl
+ [[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
+
+ local subdir
+ for subdir in src man $(usex nls po ''); do
+ emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir}
+ done
+}
+
+src_install() {
+ emake \
+ VERSION="${PV}" \
+ SUBDIRS="src man $(usex nls po '')" \
+ DESTDIR="${D}" \
+ install
+ newdoc debian/changelog ChangeLog.debian
+
+ if use nls; then
+ local dir
+ for dir in "${WORKDIR}"/deb/usr/share/man/*; do
+ [ -f "${dir}"/man1/realpath.1 ] || continue
+ newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
+ done
+ fi
+}
diff --git a/app-misc/recoll-1.23.3 b/app-misc/recoll-1.23.3
deleted file mode 100644
index 83757062bf33..000000000000
--- a/app-misc/recoll-1.23.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/xapian:= sys-libs/zlib virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE ) ) spell? ( app-text/aspell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] qt5? ( dev-qt/linguist-tools:5 )
-DESCRIPTION=A personal full text search package
-EAPI=6
-HOMEPAGE=http://www.lesbonscomptes.com/recoll/
-IUSE=camelcase doc +inotify qt5 session +spell kernel_linux python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:= sys-libs/zlib virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE ) ) spell? ( app-text/aspell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip sys-apps/sed virtual/awk
-REQUIRED_USE=session? ( inotify ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.23.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=103bf904ecf0488fe8796649de5a146a
diff --git a/app-misc/recoll-1.23.6 b/app-misc/recoll-1.23.6
deleted file mode 100644
index 88b7678e65bb..000000000000
--- a/app-misc/recoll-1.23.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] qt5? ( dev-qt/linguist-tools:5 )
-DESCRIPTION=A personal full text search package
-EAPI=6
-HOMEPAGE=http://www.lesbonscomptes.com/recoll/
-IUSE=camelcase doc +inotify qt5 session +spell kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip
-REQUIRED_USE=session? ( inotify ) python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.23.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c060c7080b3c1ce4d4c35d91693e8839
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
new file mode 100644
index 000000000000..7166661679be
--- /dev/null
+++ b/app-misc/recoll/Manifest
@@ -0,0 +1,6 @@
+AUX recoll-python3.patch 473 BLAKE2B 78b15249de8b20a46e3331d90c52cc8987278d4c508480ceab35ee878c9467f796b209dca5eb0ed5637019718a5e0dc7a2888283b149041ffcedfc175419509c SHA512 50cd8bea004e2ee3a7b861b3b9bc981d5dc0656421894dc8f47777516f290aaaba4300eff52d01d496c873d0f135bfb39f2606a41e95a3dc4edd0a1195614774
+DIST recoll-1.23.3.tar.gz 2590148 BLAKE2B ec058bac500aa61b4e395720bffcc2bfbcaded954c986e8e1fe69720456267c33b5e34eb3e28de47f57d9af207c60b138c521792882b093120b988b682600b2a SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06
+DIST recoll-1.23.6.tar.gz 2601494 BLAKE2B e64ed422a1ac1a816091f9ee00ee23b551690f5038cf3378a00ebf39c9e4f4e22436105ed01a1aa2bc21b633c85a73ba2847a265e4d199109a8b0c03ec53421e SHA512 ae6f6dfe5e63faf2310b32bd0ffd90f08b12de7452ded9e5bd58a45690797caa9f5c66ea94ef94ed7a4ee3e55083cc191fbecfc112dbce42415d0af1300fe8fd
+EBUILD recoll-1.23.3.ebuild 3537 BLAKE2B a6fbcf8c4f6f0fa5649748b743cd790e18794d1b4ccb5b0e7dea727c919e7e13379d1b581ca780133b95da610f35004c9eb861681f90d5209481fb96a2479905 SHA512 15a1cd9c52b3e564c34ec81826527dab8f4d9b543d80497b6cdc2ba1b6c63422a3b7d20ccbf464e91f8cf59a7f244ddad0e96d3904563486a94d1f8f658906e1
+EBUILD recoll-1.23.6.ebuild 3543 BLAKE2B 7759c44f9c0325e2daa478f5c63e5c14c362031f4633ad0209c974ae81a3f362da655266df079de66b8c95871087753dcd8a921cafc52ce0456c085b53aa46a7 SHA512 0770d7316dd8d9385d8210e8bd10f2a4b4ef298880c1423226be366e79fc974abd7fc9bc5ec4ad8bb00126fd2f24ef58f5f6faa5f50c27ca1219efacff410085
+MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
diff --git a/app-misc/recoll/files/recoll-python3.patch b/app-misc/recoll/files/recoll-python3.patch
new file mode 100644
index 000000000000..6d6fbdf39618
--- /dev/null
+++ b/app-misc/recoll/files/recoll-python3.patch
@@ -0,0 +1,17 @@
+--- a/filters/recoll-we-move-files.py
++++ b/filters/recoll-we-move-files.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python2
+ # Copyright (C) 2017 J.F.Dockes
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -42,6 +42,8 @@ try:
+ except:
+ import rclconfig
+
++from __future__ import print_function
++
+ verbosity = 0
+ def logdeb(s):
+ if verbosity >= 4:
diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
new file mode 100644
index 000000000000..1e89b50bb67b
--- /dev/null
+++ b/app-misc/recoll/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ppurka@gmail.com</email>
+ <name>Punarbasu 'ppurka' Purkayastha</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers Project</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>jfd@recoll.org</email>
+ <name>Jean-Francois Dockes</name>
+ </maintainer>
+ <bugs-to>https://bitbucket.org/medoc/recoll/issues</bugs-to>
+ </upstream>
+ <use>
+ <flag name="camelcase">Enable indexing for camelCase sentences and words</flag>
+ <flag name="inotify">Use the Linux Kernel notification subsystem for monitoring file alterations in realtime</flag>
+ <flag name="session">Stop monitoring file alterations when X11 session terminates</flag>
+ </use>
+ <longdescription lang="en">
+ Recoll is a desktop full-text search tool. It can search most document
+ formats. You may need external applications for text extraction. It
+ can reach any storage place: files, archive members, email attachments,
+ transparently handling decompression.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/recoll/recoll-1.23.3.ebuild b/app-misc/recoll/recoll-1.23.3.ebuild
new file mode 100644
index 000000000000..36095b328a97
--- /dev/null
+++ b/app-misc/recoll/recoll-1.23.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info python-single-r1 qmake-utils
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="camelcase doc +inotify qt5 session +spell"
+REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+ dev-libs/xapian:=
+ sys-libs/zlib
+ virtual/libiconv
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebkit:5
+ )
+ session? (
+ inotify? ( x11-libs/libSM x11-libs/libICE )
+ )
+ spell? ( app-text/aspell )
+ ${PYTHON_DEPS}
+"
+
+DEPEND="
+ ${CDEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ sys-apps/sed
+ virtual/awk
+"
+
+pkg_setup() {
+ if has_version "<app-misc/recoll-1.20"; then
+ einfo "Installing ${PV} over an 1.19 index is possible,"
+ einfo "but there have been small changes in the way"
+ einfo "compound words are indexed. So it is best to reset"
+ einfo "the index. The best method to reset the index is to"
+ einfo "quit all recoll programs and delete the index directory"
+ einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+ fi
+ if use inotify; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ check_extra_config
+ fi
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang filters
+ default
+}
+
+src_configure() {
+ local qtconf
+ if use qt5; then
+ export QMAKE="$(qt5_get_bindir)/qmake"
+ qtconf="--enable-qtgui --enable-webkit"
+ else
+ qtconf="--disable-qtgui --disable-webkit"
+ fi
+
+ econf \
+ $(use_enable camelcase) \
+ $(use_enable session x11mon) \
+ $(use_with inotify) \
+ $(use_with spell aspell) \
+ ${qtconf} \
+ --without-fam \
+ --enable-recollq
+}
+
+src_install() {
+ emake STRIP="$(type -P true)" DESTDIR="${D}" install
+ prune_libtool_files
+
+ # html docs should be placed in /usr/share/doc/${PN}/html
+ use doc && dodoc "${ED}"/usr/share/recoll/doc/*
+ rm -r "${ED}/usr/share/recoll/doc" || die
+}
+
+pkg_postinst() {
+ einfo "In order to extract the full functionality of "
+ einfo "recoll, the following packages should be installed "
+ einfo "to get the corresponding document support."
+
+ optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+ optfeature "PDF files support" app-text/poppler
+ optfeature "PDF files with OCR support" app-text/tesseract
+ optfeature "MS Word files support" app-text/antiword
+ optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+ optfeature "Lyx files support" app-office/lyx
+ optfeature "CHM files support" dev-python/pychm
+ optfeature "GNU Info files support" sys-apps/texinfo
+ optfeature "RAR archives support" dev-python/rarfile
+ optfeature "7zip archives support" dev-python/pylzma
+ optfeature "iCalendar files support" dev-python/icalendar
+ optfeature "Postscript files support" app-text/pstotext
+ optfeature "RTF files support" app-text/unrtf
+ optfeature "TeX files support" dev-text/detex
+ optfeature "DVI files support" virtual/tex-base
+ optfeature "DJVU files support" app-text/djvu
+ optfeature "tags in audio files support" media-libs/mutagen
+ optfeature "tags in image files support" media-libs/exiftool
+ optfeature "Midi karaoke files support" dev-python/chardet
+}
diff --git a/app-misc/recoll/recoll-1.23.6.ebuild b/app-misc/recoll/recoll-1.23.6.ebuild
new file mode 100644
index 000000000000..685945ed2d2e
--- /dev/null
+++ b/app-misc/recoll/recoll-1.23.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info python-single-r1 qmake-utils
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase doc +inotify qt5 session +spell"
+REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+ dev-libs/xapian:=
+ sys-libs/zlib:=
+ virtual/libiconv
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebkit:5
+ )
+ session? (
+ inotify? (
+ x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libX11
+ )
+ )
+ spell? ( app-text/aspell )
+ ${PYTHON_DEPS}
+"
+
+DEPEND="
+ ${CDEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+"
+
+PATCHES=( "${FILESDIR}/recoll-python3.patch" )
+
+pkg_setup() {
+ if has_version "<app-misc/recoll-1.20"; then
+ einfo "Installing ${PV} over an 1.19 index is possible,"
+ einfo "but there have been small changes in the way"
+ einfo "compound words are indexed. So it is best to reset"
+ einfo "the index. The best method to reset the index is to"
+ einfo "quit all recoll programs and delete the index directory"
+ einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+ fi
+ if use inotify; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ check_extra_config
+ fi
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ python_fix_shebang filters
+}
+
+src_configure() {
+ use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+ econf \
+ $(use_enable camelcase) \
+ $(use_enable session x11mon) \
+ $(use_enable qt5 qtgui) \
+ $(use_enable qt5 webkit) \
+ $(use_with inotify) \
+ $(use_with spell aspell) \
+ --without-fam \
+ --enable-recollq
+}
+
+src_install() {
+ emake STRIP="$(type -P true)" DESTDIR="${D}" install
+
+ # html docs should be placed in /usr/share/doc/${PN}/html
+ use doc && dodoc -r "${ED}"/usr/share/recoll/doc/.
+ rm -r "${ED}/usr/share/recoll/doc" || die
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ einfo "In order to extract the full functionality of "
+ einfo "recoll, the following packages should be installed "
+ einfo "to get the corresponding document support."
+
+ optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+ optfeature "PDF files support" app-text/poppler
+ optfeature "PDF files with OCR support" app-text/tesseract
+ optfeature "MS Word files support" app-text/antiword
+ optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+ optfeature "Lyx files support" app-office/lyx
+ optfeature "CHM files support" dev-python/pychm
+ optfeature "GNU Info files support" sys-apps/texinfo
+ optfeature "RAR archives support" dev-python/rarfile
+ optfeature "7zip archives support" dev-python/pylzma
+ optfeature "iCalendar files support" dev-python/icalendar
+ optfeature "Postscript files support" app-text/pstotext
+ optfeature "RTF files support" app-text/unrtf
+ optfeature "TeX files support" dev-text/detex
+ optfeature "DVI files support" virtual/tex-base
+ optfeature "DJVU files support" app-text/djvu
+ optfeature "tags in audio files support" media-libs/mutagen
+ optfeature "tags in image files support" media-libs/exiftool
+ optfeature "Midi karaoke files support" dev-python/chardet
+}
diff --git a/app-misc/regex-markup-0.10.0-r1 b/app-misc/regex-markup-0.10.0-r1
deleted file mode 100644
index 024163eabea9..000000000000
--- a/app-misc/regex-markup-0.10.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A tool to color syslog files as well
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/regex-markup/
-IUSE=examples nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/regex-markup/regex-markup-0.10.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6bf56a4376fde817e19edddf1caca0ab
diff --git a/app-misc/regex-markup/Manifest b/app-misc/regex-markup/Manifest
new file mode 100644
index 000000000000..10706993e460
--- /dev/null
+++ b/app-misc/regex-markup/Manifest
@@ -0,0 +1,4 @@
+AUX regex-markup-0.10.0-locale.patch 646 BLAKE2B 6e445af3492563105352ca63930e7f52a2389d96181aa86e85d28e5ff89d72c28f5ac368d06e46cf4e6d1e2f8adb65f279f494f9413349b79fa947b165bfe0a0 SHA512 d1d181950c1aef34df631f5a9143163e62bbb5171bbcfac7099998e7e658952ae19181e37e95b1d6f2e65cec34ce23d2aa0894cd93e8b4a84f0410d751c36177
+DIST regex-markup-0.10.0.tar.gz 424480 BLAKE2B 1b1aa0054c754b4ec36e7a06a38617b01fc86699159c98c709fd9b2bd7394644c8eb69eb0b1e4b39fa157c02daa3a55767edce831bcc7f4ceff7f40786b4efbd SHA512 fddb43b41771e5f75a140798304023087931da383cdee0b6fa9c0bd867e9e5280f484bc6182960c08993d91963de22fa9f0052e867a58067dfc39d9b761e0e9f
+EBUILD regex-markup-0.10.0-r1.ebuild 675 BLAKE2B b0aef5017ff3a2c513a5ba24f84acfdd27bd7b86870c533af2eeecc0b6f53667708feee8a431b85a0df121efb987886c3a305fe03beaf1a309fbd736913fbcaa SHA512 b41ef5ef2f0b7d2037dccb5fb2493e5c827e55b8cd9da4da2f7a0a482906e9b3021b9435af7b696664a66b62e7643eb5b1b2afef3c6d970298263437d817f234
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch b/app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch
new file mode 100644
index 000000000000..be9c74a66ceb
--- /dev/null
+++ b/app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch
@@ -0,0 +1,29 @@
+ src/cacheline.c | 2 ++
+ src/remark.c | 1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/cacheline.c b/src/cacheline.c
+index 8c6f97b..f395c60 100644
+--- a/src/cacheline.c
++++ b/src/cacheline.c
+@@ -27,6 +27,8 @@
+ #include "getline.h" /* Gnulib/GNU Libc */
+ #include "version-etc.h" /* Gnulib */
+
++#include <locale.h>
++
+ enum {
+ HELP_OPT = 256,
+ VERSION_OPT
+diff --git a/src/remark.c b/src/remark.c
+index dcf8327..8998112 100644
+--- a/src/remark.c
++++ b/src/remark.c
+@@ -44,6 +44,7 @@
+ #include "common/intutil.h"
+ /* regex-markup */
+ #include "remark.h"
++#include <locale.h>
+
+ #define PROGRAM "remark"
+
diff --git a/app-misc/regex-markup/metadata.xml b/app-misc/regex-markup/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/regex-markup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild b/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..042bcb70aa2d
--- /dev/null
+++ b/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A tool to color syslog files as well"
+HOMEPAGE="http://www.nongnu.org/regex-markup/"
+SRC_URI="https://savannah.nongnu.org/download/regex-markup/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples nls"
+
+PATCHES=(
+ "${FILESDIR}/${P}-locale.patch"
+)
+
+src_configure() {
+ # fix #570960 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ econf \
+ --enable-largefile \
+ $(use_enable nls)
+}
+
+src_install() {
+ default
+ if use examples; then
+ cd examples || die
+ emake -f Makefile
+ fi
+}
diff --git a/app-misc/regionset-0.1-r1 b/app-misc/regionset-0.1-r1
deleted file mode 100644
index f19110f77a4b..000000000000
--- a/app-misc/regionset-0.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Sets the region on DVD drives
-EAPI=4
-HOMEPAGE=http://linvdr.org/projects/regionset/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linvdr.org/download/regionset/regionset-0.1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b1bffd506b6967fb1d0aba72e2ec346d
diff --git a/app-misc/regionset-0.2 b/app-misc/regionset-0.2
deleted file mode 100644
index 64ec42695794..000000000000
--- a/app-misc/regionset-0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Sets the region on DVD drives
-EAPI=5
-HOMEPAGE=http://linvdr.org/projects/regionset/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linvdr.org/download/regionset/regionset-0.2.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=bba51414748da224b96644a088178a59
diff --git a/app-misc/regionset/Manifest b/app-misc/regionset/Manifest
new file mode 100644
index 000000000000..2a2705efb7a9
--- /dev/null
+++ b/app-misc/regionset/Manifest
@@ -0,0 +1,5 @@
+DIST regionset-0.1.tar.gz 17095 BLAKE2B a72d73b921a5f93515462ae287766c75d5019663244569504ab29220c53804919c08a6120e24f6e9c06a01f304f8a4188129d199c1f0f028443f39e074c6c9d3 SHA512 19e1a681f6acc9f7da064432f893cd6736e3b54e5f0187025b9702a7301a982bc2f3948604e3bc9f7f15b20feb0dbc0424ad9727790cddb448b89189c1ce18c3
+DIST regionset-0.2.tar.gz 19063 BLAKE2B e96c014effa78d7c5f636d80edb7d74741107dd11728ca7f52c2d41919960986d37fd4245bb7975928605c6a06e7e2c31d050b847771e60af837e3f2286edb27 SHA512 7d7fa92a2031a1d18032ba0979fe0ee27ff84c02977dc03df394383a2d562925b38eedfd478ee08d60e84de60914278f7880c10a43552345fe36af0c0fee6431
+EBUILD regionset-0.1-r1.ebuild 945 BLAKE2B 6f6d7a8e00d64a19950a4c28c02360a3c70bd68799821479b90019b993101d61785e857f3cd38e493b081f8054e7d59057c1eaf871a9c0c1d590a5a36d65a341 SHA512 b41176ef36842aaa5bbeec7569a0232513c463cbc943f0a14bad7cdc7b0b007e4fa32fe1d8814185013f751ffa7bf77f89390133f58950a7faee2b6e6a08f0dd
+EBUILD regionset-0.2.ebuild 1013 BLAKE2B 840e01afd9ab775c8265253c820ba522c904d97d2f1b1dedda86ee8076e648ae2a0bc2d45ef1b06ab4fddbf32a0efa7c555eafee8fc0970efc3d9efa09ffefd8 SHA512 18ea86944db5cc359b0ea8bcb27a47d4378f6b5d0e82473c7a639aec231527a826c7706f163e89ae5b06b696b927a3f6222cc2f9a577bec3c194ec9f3f982b4e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/regionset/metadata.xml b/app-misc/regionset/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/regionset/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/regionset/regionset-0.1-r1.ebuild b/app-misc/regionset/regionset-0.1-r1.ebuild
new file mode 100644
index 000000000000..5622745866fe
--- /dev/null
+++ b/app-misc/regionset/regionset-0.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sets the region on DVD drives"
+HOMEPAGE="http://linvdr.org/projects/regionset/"
+SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
+}
+
+src_install() {
+ dosbin regionset || die
+ dodoc ChangeLog README || die
+}
+
+pkg_postinst() {
+ ewarn "By default regionset uses /dev/dvd, specify a different device"
+ ewarn "as a command line argument if you need to. You need write access"
+ ewarn "to do this, preferably as root."
+ ewarn
+ ewarn "Most drives can only have their region changed 4 or 5 times."
+ ewarn
+ ewarn "When you use regionset, you MUST have a cd or dvd in the drive"
+ ewarn "otherwise nasty things will happen to your drive's firmware."
+}
diff --git a/app-misc/regionset/regionset-0.2.ebuild b/app-misc/regionset/regionset-0.2.ebuild
new file mode 100644
index 000000000000..ccfb8796d511
--- /dev/null
+++ b/app-misc/regionset/regionset-0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sets the region on DVD drives"
+HOMEPAGE="http://linvdr.org/projects/regionset/"
+SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+ sed "/^\.IR/s@${PN}@${PF}@" -i ${PN}.8 || die
+}
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
+}
+
+src_install() {
+ dosbin ${PN}
+ doman ${PN}.8
+ dodoc debian/changelog README
+}
+
+pkg_postinst() {
+ ewarn "By default regionset uses /dev/dvd, specify a different device"
+ ewarn "as a command line argument if you need to. You need write access"
+ ewarn "to do this, preferably as root."
+ ewarn
+ ewarn "Most drives can only have their region changed 4 or 5 times."
+ ewarn
+ ewarn "When you use regionset, you MUST have a cd or dvd in the drive"
+ ewarn "otherwise nasty things will happen to your drive's firmware."
+}
diff --git a/app-misc/remind-03.01.15 b/app-misc/remind-03.01.15
deleted file mode 100644
index 492ede7798bf..000000000000
--- a/app-misc/remind-03.01.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=Ridiculously functional reminder program
-EAPI=5
-HOMEPAGE=http://www.roaringpenguin.com/products/remind
-IUSE=tk
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=tk? ( dev-lang/tk dev-tcltk/tcllib )
-SLOT=0
-SRC_URI=http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz
-_md5_=b075b93cd6c99dbe3e1c2d9272a6db44
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
new file mode 100644
index 000000000000..831bd0e2e0fc
--- /dev/null
+++ b/app-misc/remind/Manifest
@@ -0,0 +1,3 @@
+DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
+EBUILD remind-03.01.15.ebuild 984 BLAKE2B d55ab74017d25ab206d36400fa1c98c19ed92f24e7735475a0caa7baf74935adceab7606436aed81f7bb6711e7422a15f4dc72a4cff8caed8ba7aa44336637d5 SHA512 ccb506515eb89d8e29208e2a24f983d95f091f379c84c42a965f66422abcc09652be5585090477af8cd8ffc917e91d0fed976637b3bb17e1ba8ded2a045844e1
+MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/app-misc/remind/metadata.xml b/app-misc/remind/metadata.xml
new file mode 100644
index 000000000000..bc1b97e1eb76
--- /dev/null
+++ b/app-misc/remind/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/remind/remind-03.01.15.ebuild b/app-misc/remind/remind-03.01.15.ebuild
new file mode 100644
index 000000000000..a1ad5d91383c
--- /dev/null
+++ b/app-misc/remind/remind-03.01.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Ridiculously functional reminder program"
+HOMEPAGE="http://www.roaringpenguin.com/products/remind"
+SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="tk"
+
+RDEPEND="tk? ( dev-lang/tk dev-tcltk/tcllib )"
+
+DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
+
+src_prepare() {
+ sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]] ; then
+ ewarn "Testing fails if run as root. Skipping tests."
+ else
+ emake test
+ fi
+}
+
+src_install() {
+ default
+ dobin www/rem2html
+
+ if ! use tk ; then
+ rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
+ "${D}"/usr/bin/cm2rem* "${D}"/usr/share/man/man1/cm2rem*
+ fi
+
+ rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
+ insinto /usr/share/${PN}
+ doins -r contrib/
+}
diff --git a/app-misc/reptyr-0.6.2 b/app-misc/reptyr-0.6.2
deleted file mode 100644
index b25e4d214067..000000000000
--- a/app-misc/reptyr-0.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=A utility to attach a running program to a new terminal
-EAPI=6
-HOMEPAGE=https://github.com/nelhage/reptyr
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nelhage/reptyr/archive/reptyr-0.6.2.tar.gz https://github.com/nelhage/reptyr/commit/b45fd9238958fcf2d8f3d6fc23e6d491febea2ac.patch -> reptyr-0.6.2-sysmacros.patch
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=135ab9adbe90ad64bfb7e68eaddc5100
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
new file mode 100644
index 000000000000..d4867138c25d
--- /dev/null
+++ b/app-misc/reptyr/Manifest
@@ -0,0 +1,4 @@
+DIST reptyr-0.6.2-sysmacros.patch 598 BLAKE2B 12e024efd3a7c2e07f1930545f2c5ee78212ac0f30095208c7cd2678c66f48038576d32b1f969cf9018db12b8fcd27f900257701bc66873326cd820c2ee57c14 SHA512 2d6c711a1d1268557925d15cf5d8154bc4ce47b5475ad05a5d358fd94a882991f33a8d99608e511d15dea6c08dcac615467f52bedb46330868540b03302e0cc9
+DIST reptyr-0.6.2.tar.gz 28533 BLAKE2B 305aeb5619c1780bbc189a64786ba1148c730e518ea8fe3c5daf715fcbe0de3ad7bd107008fb2471b8a3b61e75406ebb32d99b2eb5323badbb9e5f10ed1e65dc SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327
+EBUILD reptyr-0.6.2.ebuild 952 BLAKE2B d3b5e34cc1989043a47e8d13eb066fb588688a588c256efc29991f625c01409a3e01178342a4373f2996467643395031ea30187cf1efbf80366b095677fc884d SHA512 6b70da39e56db290e52af8589437452214f458e8d28487f796000ddb4036427a798f0b38f4766860e3fc0cabdc26248823d18deb78ce80ac9a073a0b4d0cb57d
+MISC metadata.xml 472 BLAKE2B 60fe70a0a1d8761764b853a0b6a05656019e3e4c9d04a7b79b884d35b9bb112a0aa66ae4b7096d91c25fafc34dd6ea248119887eb0a44c132b7b38c6fe993d87 SHA512 6b0c72aca4cc7c33cc37aa366292889fb6907d10c6e31bb140c98b30b1bde79a81dd188d5b2b5a1eb338ca8ebb41d05c2fe9d5158d780fa4cf3ea772476166ff
diff --git a/app-misc/reptyr/metadata.xml b/app-misc/reptyr/metadata.xml
new file mode 100644
index 000000000000..c5eb1454b5dd
--- /dev/null
+++ b/app-misc/reptyr/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nelhage/reptyr</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/reptyr/reptyr-0.6.2.ebuild b/app-misc/reptyr/reptyr-0.6.2.ebuild
new file mode 100644
index 000000000000..40892b3d1a67
--- /dev/null
+++ b/app-misc/reptyr/reptyr-0.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic vcs-snapshot
+
+DESCRIPTION="A utility to attach a running program to a new terminal"
+HOMEPAGE="https://github.com/nelhage/reptyr"
+SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+# https://github.com/nelhage/reptyr/issues/81
+SRC_URI+=" https://github.com/nelhage/reptyr/commit/b45fd9238958fcf2d8f3d6fc23e6d491febea2ac.patch -> ${PN}-0.6.2-sysmacros.patch"
+
+PATCHES=(
+ "${DISTDIR}/${P}-sysmacros.patch" #581974
+)
+
+src_prepare() {
+ default
+ # respect CFLAGS
+ sed -i '/^override/d' Makefile || die
+}
+
+src_compile() {
+ append-cppflags -D_GNU_SOURCE
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dodoc ChangeLog NOTES README.md
+}
diff --git a/app-misc/resolve-march-native-0.9 b/app-misc/resolve-march-native-0.9
deleted file mode 100644
index e7aed661a992..000000000000
--- a/app-misc/resolve-march-native-0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Resolve GCC flag -march=native
-EAPI=5
-HOMEPAGE=https://github.com/hartwork/resolve-march-native
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-devel/gcc-4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.tar.gz -> resolve-march-native-0.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df2c98996153b95c704015d70a4bfc90
diff --git a/app-misc/resolve-march-native-0.9.2 b/app-misc/resolve-march-native-0.9.2
deleted file mode 100644
index d20a5d04bdf9..000000000000
--- a/app-misc/resolve-march-native-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Resolve GCC flag -march=native
-EAPI=5
-HOMEPAGE=https://github.com/hartwork/resolve-march-native
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-devel/gcc-4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.2.tar.gz -> resolve-march-native-0.9.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5557afd506dbbe2673f943d541dc0d39
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
new file mode 100644
index 000000000000..97915253801b
--- /dev/null
+++ b/app-misc/resolve-march-native/Manifest
@@ -0,0 +1,5 @@
+DIST resolve-march-native-0.9.2.tar.gz 7729 BLAKE2B 21cd69ee529b732f48db37616291757235792648d1b800a8091b091c83f4ccb523ec4e4576a4a34f6d85d91899c4890431cf41bae5c8641de06fbbd4fde301fc SHA512 918290cf0858c16f4a3730aa169768782af9f329a901e70db944172bc47c78ea18c07c448742a0c0c611951a3f50dee85cd6ffe8aba407cd40eef6f5e28c5b29
+DIST resolve-march-native-0.9.tar.gz 7688 BLAKE2B 78ef662691071b480fd382a30024f9fc73ed8f7b22b3a814237c99139d3ba6d22f348ead7c413d199875ed74768618ac97d897204a7f633977a5c5bd8726154a SHA512 2079153a1d7f8f352baa1a0000d9e120d976bca8cef2a81dde85ba1689a260fb899c8b6d97f9cd79dda41c5b67b9fe76bfdf0fc5bc88ef09d2915a29f3ed33e2
+EBUILD resolve-march-native-0.9.2.ebuild 491 BLAKE2B e93d606ce0ea9aac30547d84508908609e56d20fb478c87b851854bb07343f3ece0c2ad9a150793b414c6c65663684f3b61dfed248b5bafda78bbb890a96f527 SHA512 89db7310c9d19da8c0503b79f5494c43754e9bfc86f111784eef1823bf2da113ab0e3f9197b9fb8ca27786d59ed7b299d765f255eddcbc322ba44992fb94a5d2
+EBUILD resolve-march-native-0.9.ebuild 442 BLAKE2B bc0d1a73c4e58c75a7ce0ea00bd152218781602a225a6fb895d112addc71015ecac6ccc6a9ab86c4bc5c37306ca9f22c8545a99a72ecc5de19521b16b470d85a SHA512 399cd94d773ec28b5dd53961c290aa6a9c5a0a99c089df3f4e348cc877876f0b0c0560a97eaebca104c954b61108a510f71060909dd9f11d003e0beef248b24f
+MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/metadata.xml b/app-misc/resolve-march-native/metadata.xml
new file mode 100644
index 000000000000..2d6024f35e29
--- /dev/null
+++ b/app-misc/resolve-march-native/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hartwork/resolve-march-native</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild
new file mode 100644
index 000000000000..ed6234409b19
--- /dev/null
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Resolve GCC flag -march=native"
+HOMEPAGE="https://github.com/hartwork/resolve-march-native"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.ebuild
new file mode 100644
index 000000000000..f234833631e9
--- /dev/null
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Resolve GCC flag -march=native"
+HOMEPAGE="https://github.com/hartwork/resolve-march-native"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/rioutil-1.5.0-r2 b/app-misc/rioutil-1.5.0-r2
deleted file mode 100644
index 72fa90e33c67..000000000000
--- a/app-misc/rioutil-1.5.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libusb:0
-DESCRIPTION=Tool for transfering mp3s to and from a Rio 600, 800, Riot, and Nike PSA/Play
-EAPI=4
-HOMEPAGE=http://rioutil.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libusb:0
-SLOT=0
-SRC_URI=mirror://sourceforge/rioutil/rioutil-1.5.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ddef52bf90a3a481fd7bd07eefa17988
diff --git a/app-misc/rioutil/Manifest b/app-misc/rioutil/Manifest
new file mode 100644
index 000000000000..94f857578ce0
--- /dev/null
+++ b/app-misc/rioutil/Manifest
@@ -0,0 +1,5 @@
+AUX 75-rio.rules 1452 BLAKE2B d464d692123599291d590c82c872feb99c3c7c2f92ae92c93ef45be63533398167e140d64755da8d8382ba5297bfadb9bb33966c0ab60192982ed9dc9f450f3e SHA512 e9d953045cf4b587eb19f95ef0f429fefb1919d335662455e62334331c99ede3304952e18c52d41f0051eedd4f8148c469c75db9600c70ba954281620f760a65
+AUX rioutil-1.5.0-buffer-overflow.patch 515 BLAKE2B a5aef116bd7612489f2036b27dd5c2e7b576ef343be8551f584b672286eef37dc2b52ba1d3aa7eea868d20bff22bf9ffe30b51d5fe09fa4d70a5fa8a44141635 SHA512 6face8d7dba4f34034683a1a2bcf01c18b4feb104da2b9e15ecb57e2fc26717e4f952bd03ebdbabb92b0c63c540ca0a29f637879533dc964817744972d48edc2
+DIST rioutil-1.5.0.tar.gz 401244 BLAKE2B c7f317b0e995cbe61122891681d9756b06aacd624cbdcc75fc2111d19b0493645558e31090660bc4a4ad2ebc3b284bbff637984389c3a18bcd838e763aa4a2a8 SHA512 3e3bf1c053e2f0146c504c5015e33cd3281daad136f41d82100d6181b6720c7f1131615c663f821573d7aeb077efc1b59e8e23a8f15a851e332ad61ea0479f1d
+EBUILD rioutil-1.5.0-r2.ebuild 775 BLAKE2B 00ac259a075413e069b610b4bb2ccc59158c76ffe2f4d3a52ce72fa2c58da1c18f3f31b81f485d412cd4b8fae3e9ebe5ebc42e180071ee674a7af4cc3c2d82ac SHA512 4ddfbc0dc5a778630e3ee61343a4c9c5dc102e7ea8d46ff5575930761f41d82240e1035209e9cf9ee54d3650c2b790b58b0f9946b9d6695bbb5607f848c57134
+MISC metadata.xml 244 BLAKE2B 67a050e1c66ddff4d4f247e66cec1a878bcab385f42c2160ac71fe510d26bf92d864c530a41427e5ab26632caea12d663860457c36b4cd4723ad2c8ffe3e13bc SHA512 01c88fac77882b2f5dce193f24b996f60601ef47bce8a95b29002be2477e45cbc5ee0b702c98d9b34583d488fd0a7c7cdc90648fa36e23826989a875c0e6ca77
diff --git a/app-misc/rioutil/files/75-rio.rules b/app-misc/rioutil/files/75-rio.rules
new file mode 100644
index 000000000000..610131a7dbe2
--- /dev/null
+++ b/app-misc/rioutil/files/75-rio.rules
@@ -0,0 +1,38 @@
+ACTION!="add", GOTO="rio_rules_end"
+SUBSYSTEM!="usb|usb_device", GOTO="rio_rules_end"
+
+# Diamond flash players
+# Rio 600
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5001", MODE="0660", GROUP="usb"
+# Rio 800
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5002", MODE="0660", GROUP="usb"
+# Nike psa[play
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5003", MODE="0660", GROUP="usb"
+# Rio S10
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5005", MODE="0660", GROUP="usb"
+# Rio S50
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5006", MODE="0660", GROUP="usb"
+# Rio S35
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5007", MODE="0660", GROUP="usb"
+# Rio 900
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5008", MODE="0660", GROUP="usb"
+# Rio S30
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5009", MODE="0660", GROUP="usb"
+# Fuse
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="500d", MODE="0660", GROUP="usb"
+# Chiba
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="500e", MODE="0660", GROUP="usb"
+# Cali
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="500f", MODE="0660", GROUP="usb"
+# Cali256
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="503f", MODE="0660", GROUP="usb"
+# Rio S11
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5010", MODE="0660", GROUP="usb"
+
+# Diamond hard drive players
+# Rio Riot
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5202", MODE="0660", GROUP="usb"
+# Nitrus
+ATTRS{idVendor}=="045a", ATTRS{idProduct}=="5220", MODE="0660", GROUP="usb"
+
+LABEL="rio_rules_end"
diff --git a/app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch b/app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch
new file mode 100644
index 000000000000..1739a146c485
--- /dev/null
+++ b/app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch
@@ -0,0 +1,15 @@
+flist->genre is defined as 'char genre[17]' so don't copy 22 into it
+
+Patch by Kevin McCarthy <signals42@gmail.com>
+
+--- librioutil/file_list.c
++++ librioutil/file_list.c
+@@ -241,7 +241,7 @@
+ strncpy(flist->title, info.data->title, 64);
+ strncpy(flist->album, info.data->album, 64);
+ strncpy(flist->name, info.data->name, 64);
+- strncpy(flist->genre, (char *)info.data->genre2, 22);
++ strncpy(flist->genre, (char *)info.data->genre2, 17);
+
+ strncpy(flist->year, (char *)info.data->year2, 4);
+
diff --git a/app-misc/rioutil/metadata.xml b/app-misc/rioutil/metadata.xml
new file mode 100644
index 000000000000..531ee91f3d40
--- /dev/null
+++ b/app-misc/rioutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">rioutil</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/rioutil/rioutil-1.5.0-r2.ebuild b/app-misc/rioutil/rioutil-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..0250aa42cf18
--- /dev/null
+++ b/app-misc/rioutil/rioutil-1.5.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit multilib eutils
+
+DESCRIPTION="Tool for transfering mp3s to and from a Rio 600, 800, Riot, and Nike PSA/Play"
+HOMEPAGE="http://rioutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rioutil/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+}
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" install
+ find "${ED}" -name '*.la' -exec rm -f {} +
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}"/75-rio.rules
+}
diff --git a/app-misc/rl-0.2.7-r1 b/app-misc/rl-0.2.7-r1
deleted file mode 100644
index ef5b9c96de19..000000000000
--- a/app-misc/rl-0.2.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Randomize lines from text files or stdin
-EAPI=6
-HOMEPAGE=https://arthurdejong.org/rl
-IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ia64 ~mips ppc s390 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://arthurdejong.org/rl/rl-0.2.7.tar.gz
-_eclasses_=multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3c07e7badb54f1e8f050e8a1f61688a1
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
new file mode 100644
index 000000000000..2ae2bbf8efc4
--- /dev/null
+++ b/app-misc/rl/Manifest
@@ -0,0 +1,3 @@
+DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
+EBUILD rl-0.2.7-r1.ebuild 666 BLAKE2B cfe8238579d0a0c46cd1f6c72874a6f82e8e2df4a76d747a1d2353f8effa0e01bfbcd99d35523658b394c24bf0fac7827053a9627adeba7ea4a7c3f825f7ffb0 SHA512 7e817cf83f7d270d4d4be46c7a5affe080069b97daba97cf98b2de92ea12865dd24e7326719be9c41789ac75b4e098de4003081f741a71f7f1a1d20c7f31b3a9
+MISC metadata.xml 468 BLAKE2B 4c1af622a68e3143bd38cf066917ea736fb59716aedb6d43e23579eed67d2f0180f7b3eb0565f7bd98c546e223cae59454aad21aa803c2898d6147d4fb4ec7e1 SHA512 0cffb46412913a382016065cf31b162d6043e94a4dc05f1f7b979e057717365ffd9702518330b0582218b792c8ac307184b22902c978e49b5e3de5471b1c959c
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
new file mode 100644
index 000000000000..b78a944212a5
--- /dev/null
+++ b/app-misc/rl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>swegener@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription>randomize lines can be used to randomize the contents of text files or standard input.</longdescription>
+</pkgmetadata>
diff --git a/app-misc/rl/rl-0.2.7-r1.ebuild b/app-misc/rl/rl-0.2.7-r1.ebuild
new file mode 100644
index 000000000000..767c390d1e14
--- /dev/null
+++ b/app-misc/rl/rl-0.2.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Randomize lines from text files or stdin"
+HOMEPAGE="https://arthurdejong.org/rl"
+SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ~mips ppc s390 sparc x86"
+IUSE="debug"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
+
+multilib_src_configure() {
+ local myeconfargs=()
+ use debug && myeconfargs+=(--enable-debug)
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ multilib-minimal_src_compile
+}
+
+src_install() {
+ multilib-minimal_src_install
+}
diff --git a/app-misc/rlwrap-0.42 b/app-misc/rlwrap-0.42
deleted file mode 100644
index 64ff0791f602..000000000000
--- a/app-misc/rlwrap-0.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=GNU readline wrapper
-EAPI=5
-HOMEPAGE=http://utopia.knoware.nl/~hlub/uck/rlwrap/
-IUSE=debug
-KEYWORDS=amd64 ~mips ppc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=http://utopia.knoware.nl/~hlub/uck/rlwrap/rlwrap-0.42.tar.gz
-_md5_=9d879294677b2ac1e33742c13e574415
diff --git a/app-misc/rlwrap-0.42-r1 b/app-misc/rlwrap-0.42-r1
deleted file mode 100644
index f3a90aa82b1e..000000000000
--- a/app-misc/rlwrap-0.42-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=GNU readline wrapper
-EAPI=6
-HOMEPAGE=http://utopia.knoware.nl/~hlub/uck/rlwrap/
-IUSE=debug
-KEYWORDS=~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=http://utopia.knoware.nl/~hlub/uck/rlwrap/rlwrap-0.42.tar.gz
-_md5_=08f82d8ea93ed4e8fd6223a2be68f159
diff --git a/app-misc/rlwrap-0.43 b/app-misc/rlwrap-0.43
deleted file mode 100644
index 87baa47b0972..000000000000
--- a/app-misc/rlwrap-0.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=GNU readline wrapper
-EAPI=6
-HOMEPAGE=http://utopia.knoware.nl/~hlub/uck/rlwrap/
-IUSE=debug
-KEYWORDS=~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/hanslub42/rlwrap/releases/download/v0.43/rlwrap-0.43.tar.gz
-_md5_=9dc812ab2933926277939cc46976bfd9
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
new file mode 100644
index 000000000000..3153bfd03786
--- /dev/null
+++ b/app-misc/rlwrap/Manifest
@@ -0,0 +1,6 @@
+DIST rlwrap-0.42.tar.gz 279608 BLAKE2B e8569d35cb0b8b3309af71122c1a48039fe559372648fe05c73f0a545c4efbae75aadaf80faa302033134cbd569ab90b9d314e2bd2c1bc387fd1434d39418245 SHA512 991885e75aabf0d43581d59f7c78f7f64c3f32072de08ff5796cba75c0716548d2186cbe2d739f3e772871e3586d036f069db73b2ee8a30b2f7985088d0f68df
+DIST rlwrap-0.43.tar.gz 313139 BLAKE2B d2aaf32abe69b0307321192542c88acbf5af00e23476e7205cddbc8c5adbab4c5a10090d8ef04e9adfc62209f37f101bfc3e294e634379844417c80540485532 SHA512 4a1440b2eef3a1664c6381eb09c19f4030de2c0ef4f1f3509f7d6e130d3c5e9c3ceb00fc6ea6052b22bbe1f6b162f72e0b47564df34ccecc5220f195c22e86a1
+EBUILD rlwrap-0.42-r1.ebuild 524 BLAKE2B a91644358950129e12d6b74641b874f8102d8890d0654ce54f106f4516dc76a689b6ab06c3d7dca573127120cdad72ec2f8262fb9ce2ee37f14e378d161075d4 SHA512 6f8cff5a06edb8e5c2dc6b1cc72aa8704eafa79d8014175955a8b387a8825f90768c111facfe6d7fd7de1af4d92146b2539efccd7e0f772285b793376b78c1ed
+EBUILD rlwrap-0.42.ebuild 631 BLAKE2B eb01cac471f448a26d2277368c5bc459134f41c08bfd360203e58ff1fa7368ef7c100dbdb06f632d464d360ff33f71345466b5f1c19a2a9182750e53b3182829 SHA512 6e9c7d7750a40ba31bb64d17b0069cde45b06af3c19eb5513e2d4282da0dc9ac0fffafcf4101ee68548d812f46793d588ea58b1f0708bd155b103b775069ca35
+EBUILD rlwrap-0.43.ebuild 602 BLAKE2B 8cee19013278beb1c218ea6730fbf5e8e1edf8e581e921843010be140f55db2c2fb68dd682fe0a331fcb3dd184e7951996ef9ae2ae631819f3b5eb33a39cb221 SHA512 8778074bdf47a91d2de60d5da476eef60f0ce5a18a351582fb47e97313d9e7d94c9ca5105ff8c317f6bd88cb72a5c657b269048257bc11798e520a2f2b2e10bb
+MISC metadata.xml 707 BLAKE2B cb970829cfc9eca1dc9dfc2cab28410f39c8a7ad2dfffb44d52e093653d43ff20f1a3b622aa6fe8c35091c79d45d1db1d4ab6244ad3d7d9c9083813dde4d17b0 SHA512 8f6da0c6c96533098cd750c1dc4cbae6d94bbf4a285561ba52a3fb1ab414ead6a4f1e1a600cd120cda4355a5c52365938921ee43df560015296f15528d79c8ff
diff --git a/app-misc/rlwrap/metadata.xml b/app-misc/rlwrap/metadata.xml
new file mode 100644
index 000000000000..a6f90e84d17f
--- /dev/null
+++ b/app-misc/rlwrap/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+ </maintainer>
+ <longdescription>
+ rlwrap is a 'readline wrapper' that uses the GNU Readline library to
+ allow the editing of keyboard input for any other command. Input
+ history is remembered across invocations, separately for each command;
+ history completion and search work as in bash and completion word
+ lists can be specified on the command line.
+ </longdescription>
+ <use>
+ <flag name="debug">Enable debug</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
new file mode 100644
index 000000000000..ab1551ea5406
--- /dev/null
+++ b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GNU readline wrapper"
+HOMEPAGE="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
+SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable debug)
+}
diff --git a/app-misc/rlwrap/rlwrap-0.42.ebuild b/app-misc/rlwrap/rlwrap-0.42.ebuild
new file mode 100644
index 000000000000..75ca6471b3cb
--- /dev/null
+++ b/app-misc/rlwrap/rlwrap-0.42.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GNU readline wrapper"
+HOMEPAGE="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
+SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable debug)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS BUGS ChangeLog NEWS README # PLEA TODO
+}
diff --git a/app-misc/rlwrap/rlwrap-0.43.ebuild b/app-misc/rlwrap/rlwrap-0.43.ebuild
new file mode 100644
index 000000000000..1c8556e3799d
--- /dev/null
+++ b/app-misc/rlwrap/rlwrap-0.43.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GNU readline wrapper"
+HOMEPAGE="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
+SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
+SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf $(use_enable debug)
+}
diff --git a/app-misc/rox-filer-2.11 b/app-misc/rox-filer-2.11
deleted file mode 100644
index d3db61333c55..000000000000
--- a/app-misc/rox-filer-2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=ROX-Filer a drag and drop spatial file manager
-EAPI=5
-HOMEPAGE=http://rox.sourceforge.net/desktop
-IUSE=test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-misc/shared-mime-info
-SLOT=0
-SRC_URI=mirror://sourceforge/rox/rox-filer-2.11.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=5f820861c42c6aa9c95c34244f440c50
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
new file mode 100644
index 000000000000..bd3e64764ee7
--- /dev/null
+++ b/app-misc/rox-filer/Manifest
@@ -0,0 +1,5 @@
+AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f5411a6aea7a833f2679d9f47a783631443bf2618a4d6be293e5ce14da295713bd7b97af36edaffa3aedbfcea3de513ac1fd455b SHA512 28cb208bc51c500ad766bf832f8098bd44813626be2ed3c50c37d0cff5193e1dc1a4430ec40ee7290befb1f20b4a506f03c8c327760b75e06d08ec646b24638c
+AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
+DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
+EBUILD rox-filer-2.11.ebuild 2368 BLAKE2B a0ae8b22e3269fe8c528877f9585751185715c018de5a03f70c9c7f98a653b926fe8917b0612b6b320f9fc73c56848e9924da204f16c3bc15eb2dd464b7980cd SHA512 44feeda938ad145cfacd7f74106c619e4dcf7eeca856fbc12aff921fca5e53052a6f11772d44976f388dbfb24cf979328ccc99b364f58b42ea533bada138fe8f
+MISC metadata.xml 1128 BLAKE2B 16ca555c11ddd1a0de2ac5381be54c415f16329fdf10e6523ab078db320c57f6c35e1656fb1d026ce0615da9eb4bcf08b9f565a5aea34e8a1ac3fbd0b20e2bae SHA512 23fe490bc592c9d4288966aaf41bff4a68605c15ae9778dc1a89f89e5b2fea2c4e0e9c9e12b8080c744d79a5b7d4b7abb534ce02744dc517aaf7af679764b453
diff --git a/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch b/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch
new file mode 100644
index 000000000000..d5400ec5f63f
--- /dev/null
+++ b/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch
@@ -0,0 +1,15 @@
+--- /root/configure 2015-03-09 16:39:03.921516152 +0800
++++ src/configure 2015-03-09 16:39:08.455516081 +0800
+@@ -2133,12 +2133,6 @@
+
+ ac_config_headers="$ac_config_headers config.h"
+
+-
+- if [ -f configure ]; then
+- as_fn_error $? "Please run configure from the build directory (try ../AppRun --compile)" "$LINENO" 5
+- exit 1
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/app-misc/rox-filer/files/rox.desktop b/app-misc/rox-filer/files/rox.desktop
new file mode 100644
index 000000000000..e0b83df58bc2
--- /dev/null
+++ b/app-misc/rox-filer/files/rox.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Rox-Filer
+Comment=The Rox File Manager
+Icon=rox
+Exec=rox
+Categories=GTK;System;Core;
+StartupNotify=true
+Terminal=false
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
new file mode 100644
index 000000000000..65dec56d6380
--- /dev/null
+++ b/app-misc/rox-filer/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>ppurka@gmail.com</email>
+ <name>Punarbasu 'ppurka' Purkayastha</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers Project</name>
+</maintainer>
+<upstream>
+ <maintainer status="active">
+ <email>talex5@gmail.com</email>
+ <name>Thomas Leonard</name>
+ </maintainer>
+ <bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to>
+ <remote-id type="sourceforge">rox</remote-id>
+</upstream>
+<longdescription lang="en">
+ ROX-Filer is a fast and powerful graphical file manager for the
+ X Window System. You can use it as a small and fast filer within your
+ current desktop, or get it to manage your pinboard, panels and
+ applications. It is also the core component of the ROX Desktop.
+ Many of the filer's features were inspired by RISC OS. `ROX'
+ stands for `RISC OS–On–X'. The latest development for ROX-Filer can be
+ found in GitHub: https://github.com/rox-desktop/rox-filer
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
new file mode 100644
index 000000000000..98807eb99883
--- /dev/null
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils virtualx
+
+DESCRIPTION="ROX-Filer a drag and drop spatial file manager"
+HOMEPAGE="http://rox.sourceforge.net/desktop"
+SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+COMMON_DEPEND="dev-lang/perl
+ dev-libs/libxml2:2
+ gnome-base/libglade:2.0
+ x11-libs/gtk+:2"
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/shared-mime-info"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${P}"/ROX-Filer/src
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-in-source-build.patch"
+
+ sed -i -e 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' \
+ main.c || die "sed failed"
+}
+
+src_configure() {
+ econf LIBS="-lm -ldl"
+}
+
+src_install() {
+ cd "${WORKDIR}/${P}"/ROX-Filer || die
+ dodir /usr/share/applications /usr/share/pixmaps /usr/share/rox/Help
+ insinto /usr/share/rox
+ doins -r Messages Options.xml ROX images style.css .DirIcon Templates.ui
+ insinto /usr/share/rox/Help
+ doins Help/*.html Help/README*
+
+ doman ../rox.1
+
+ newbin ROX-Filer rox
+
+ dosym text-x-diff.png /usr/share/rox/ROX/MIME/text-x-patch.png
+ dosym application-x-font-afm.png /usr/share/rox/ROX/MIME/application-x-font-type1.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-xml-dtd.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-xml-external-parsed-entity.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-rdf+xml.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-x-xbel.png
+ dosym application-x-shellscript.png /usr/share/rox/ROX/MIME/application-javascript.png
+ dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-xz-compressed-tar.png
+ dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-lzma-compressed-tar.png
+ dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-lzo.png
+ dosym application-x-bzip.png /usr/share/rox/ROX/MIME/application-x-xz.png
+ dosym application-x-gzip.png /usr/share/rox/ROX/MIME/application-x-lzma.png
+ dosym application-msword.png /usr/share/rox/ROX/MIME/application-rtf.png
+
+ dosym ../rox/.DirIcon /usr/share/pixmaps/rox.png
+
+ insinto /usr/share/applications
+ doins "${FILESDIR}"/rox.desktop
+}
diff --git a/app-misc/rq-0.10.4 b/app-misc/rq-0.10.4
deleted file mode 100644
index fa2b04305d95..000000000000
--- a/app-misc/rq-0.10.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=sys-devel/clang >=dev-util/cargo-0.13.0
-DESCRIPTION=record query - a tool for doing record analysis and transformation
-EAPI=6
-HOMEPAGE=https://github.com/dflemstr/rq
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/dflemstr/rq/archive/v0.10.4.tar.gz -> rq-0.10.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.2/download -> aho-corasick-0.6.2.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/aster/0.38.0/download -> aster-0.38.0.crate https://crates.io/api/v1/crates/atty/0.2.2/download -> atty-0.2.2.crate https://crates.io/api/v1/crates/backtrace/0.3.0/download -> backtrace-0.3.0.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.10/download -> backtrace-sys-0.1.10.crate https://crates.io/api/v1/crates/bindgen/0.22.1/download -> bindgen-0.22.1.crate https://crates.io/api/v1/crates/bitflags/0.4.0/download -> bitflags-0.4.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.8.0/download -> bitflags-0.8.0.crate https://crates.io/api/v1/crates/byteorder/1.0.0/download -> byteorder-1.0.0.crate https://crates.io/api/v1/crates/cexpr/0.2.0/download -> cexpr-0.2.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/clang/0.15.0/download -> clang-0.15.0.crate https://crates.io/api/v1/crates/clang-sys/0.14.0/download -> clang-sys-0.14.0.crate https://crates.io/api/v1/crates/clap/2.21.1/download -> clap-2.21.1.crate https://crates.io/api/v1/crates/crc/1.4.0/download -> crc-1.4.0.crate https://crates.io/api/v1/crates/dbghelp-sys/0.2.0/download -> dbghelp-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.7.0/download -> docopt-0.7.0.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/env_logger/0.4.2/download -> env_logger-0.4.2.crate https://crates.io/api/v1/crates/error-chain/0.9.0/download -> error-chain-0.9.0.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.4/download -> lazy_static-0.2.4.crate https://crates.io/api/v1/crates/libc/0.2.21/download -> libc-0.2.21.crate https://crates.io/api/v1/crates/libloading/0.3.2/download -> libloading-0.3.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.3.0/download -> linked-hash-map-0.3.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.1/download -> linked-hash-map-0.4.1.crate https://crates.io/api/v1/crates/log/0.3.7/download -> log-0.3.7.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/nix/0.7.0/download -> nix-0.7.0.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.37/download -> num-traits-0.1.37.crate https://crates.io/api/v1/crates/num_cpus/1.3.0/download -> num_cpus-1.3.0.crate https://crates.io/api/v1/crates/ordered-float/0.4.0/download -> ordered-float-0.4.0.crate https://crates.io/api/v1/crates/pest/0.4.1/download -> pest-0.4.1.crate https://crates.io/api/v1/crates/phf/0.7.21/download -> phf-0.7.21.crate https://crates.io/api/v1/crates/phf_codegen/0.7.21/download -> phf_codegen-0.7.21.crate https://crates.io/api/v1/crates/phf_generator/0.7.21/download -> phf_generator-0.7.21.crate https://crates.io/api/v1/crates/phf_shared/0.7.21/download -> phf_shared-0.7.21.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/protobuf/1.2.2/download -> protobuf-1.2.2.crate https://crates.io/api/v1/crates/quasi/0.29.0/download -> quasi-0.29.0.crate https://crates.io/api/v1/crates/quasi_codegen/0.29.0/download -> quasi_codegen-0.29.0.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.1/download -> regex-0.2.1.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.4.0/download -> regex-syntax-0.4.0.crate https://crates.io/api/v1/crates/rmp/0.8.5/download -> rmp-0.8.5.crate https://crates.io/api/v1/crates/rmpv/0.2.0/download -> rmpv-0.2.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.4/download -> rustc-demangle-0.1.4.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/serde/0.8.23/download -> serde-0.8.23.crate https://crates.io/api/v1/crates/serde/0.9.11/download -> serde-0.9.11.crate https://crates.io/api/v1/crates/serde-hjson/0.8.1/download -> serde-hjson-0.8.1.crate https://crates.io/api/v1/crates/serde-value/0.4.0/download -> serde-value-0.4.0.crate https://crates.io/api/v1/crates/serde_cbor/0.5.2/download -> serde_cbor-0.5.2.crate https://crates.io/api/v1/crates/serde_codegen_internals/0.14.1/download -> serde_codegen_internals-0.14.1.crate https://crates.io/api/v1/crates/serde_derive/0.9.11/download -> serde_derive-0.9.11.crate https://crates.io/api/v1/crates/serde_json/0.9.9/download -> serde_json-0.9.9.crate https://crates.io/api/v1/crates/serde_test/0.8.23/download -> serde_test-0.8.23.crate https://crates.io/api/v1/crates/serde_yaml/0.6.2/download -> serde_yaml-0.6.2.crate https://crates.io/api/v1/crates/siphasher/0.2.1/download -> siphasher-0.2.1.crate https://crates.io/api/v1/crates/snap/0.2.1/download -> snap-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.9/download -> syn-0.11.9.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex/0.54.0/download -> syntex-0.54.0.crate https://crates.io/api/v1/crates/syntex_errors/0.54.0/download -> syntex_errors-0.54.0.crate https://crates.io/api/v1/crates/syntex_pos/0.54.0/download -> syntex_pos-0.54.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.54.0/download -> syntex_syntax-0.54.0.crate https://crates.io/api/v1/crates/target_build_utils/0.3.0/download -> target_build_utils-0.3.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/term_size/0.2.3/download -> term_size-0.2.3.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread-id/3.0.0/download -> thread-id-3.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.3.1/download -> toml-0.3.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.1.0/download -> unicode-segmentation-1.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/v8/0.9.6/download -> v8-0.9.6.crate https://crates.io/api/v1/crates/v8-api/0.7.3/download -> v8-api-0.7.3.crate https://crates.io/api/v1/crates/v8-sys/0.14.7/download -> v8-sys-0.14.7.crate https://crates.io/api/v1/crates/vec_map/0.7.0/download -> vec_map-0.7.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/xdg-basedir/1.0.0/download -> xdg-basedir-1.0.0.crate https://crates.io/api/v1/crates/yaml-rust/0.3.5/download -> yaml-rust-0.3.5.crate amd64? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/x86_64-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-x86_64-build.tar.gz ) x86? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/i686-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-i686-build.tar.gz )
-_eclasses_=cargo 959846e2836f8244430c9582dd6493af multiprocessing cac3169468f893670dac3e7cb940e045
-_md5_=c7c9f90ed7ffdff91bdb5ba8e4d8c42b
diff --git a/app-misc/rq/Manifest b/app-misc/rq/Manifest
new file mode 100644
index 000000000000..87eea8b11395
--- /dev/null
+++ b/app-misc/rq/Manifest
@@ -0,0 +1,111 @@
+DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
+DIST aho-corasick-0.6.2.crate 24901 BLAKE2B dd5accb79b342e5d03387a4d6925f8753fe5584f48a84fad4357c20c596356c07b020adc484e701e59525b9a2f3fcfbc2726b9126d61c0f5a48af3e70cd46cd9 SHA512 81a013deb96b88ddcd1ddaa10c09075feb97078c59e3fb6a49807a5004effbb523e4572fbe297fe96678f86e2529cc8afa919d3b8f3c9cf44fdee97290904229
+DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
+DIST aster-0.38.0.crate 27090 BLAKE2B a8cab0d8775261a77d7d693219afab694f8039e3e2ee3d1e8b2a4cdbb96a2e026e3abf892d7266e9df4062d457112d2798c92ef387bbce5d772fb9c67e131b96 SHA512 1bbf7e4f2b75ccfe46cc0bd960f1a0d30b5b4805c7a9d291adb3ca7dce52c271def4932c77f4824ae2a979bcc17e6fe254ef90b1b3db004fca4d559b17ccdb71
+DIST atty-0.2.2.crate 5124 BLAKE2B c49d6ad5d47be2910fd9cb96bb68ddc38489e800894679df7acd15c88d834035d9918afceb219eb6ce127e68ef2c7eb25a04f022218189283cd8d228861772f6 SHA512 6e6e2cede7f280a53a61c78126783ec0338c13a8e9bbabb91d4b6fc43aacc56a4f7e86556210029595acf18e444121998101992b40e35a64cce884ec08247d0a
+DIST backtrace-0.3.0.crate 24035 BLAKE2B 9a6b906e9ba4a73a6fd4c025c37bbe0dd9ef632b95d6a3849d2487acff639bb73e74967f01b9212adb58aba6736929839da167c881a860a266e391e4f3a0d0d9 SHA512 523b0f1f2457d3699e6b173647737a53bb6d92f3381f1a328bc2f9cb5733e7064795fd157990df6d94b30f587b15dfc8d8438fbc74d2bf2d08387ad24789e673
+DIST backtrace-sys-0.1.10.crate 282652 BLAKE2B 02dbe6d31f574556ff677b94f48ce99c0af907485fdc54323a69311c2fc7a11efd2d08bf36fdf673d73e6d1c5c99edbd3d208406215b93b7ea04ac6266db9daa SHA512 063a31423568e4f7a5a4b1dba3ba32c6ded4bb991833af569fefa398e8710e3173e059828a5c55489003d5b918b834530d99ec51a5b248f9955b643f719a5de3
+DIST bindgen-0.22.1.crate 1214174 BLAKE2B 933e020fd717c759cca6d55c76d941a68c429bf600e90cd81be4ccec3e78eb55b59c664d6dbb601c52ea8458df7e06f58c2be2125adf1497ec72a52c200d03b5 SHA512 ff5604687724a2ac73b78226436db6c2beb7598497b6fb237a3c5a99a969d81c57e6f7f7b80c353d4c5b5171b7588747e8b5111c79e24b2bfba75e39df5c3ca2
+DIST bitflags-0.4.0.crate 10186 BLAKE2B 18d35df427bdee8b345cbfbdb891cf97b5c82ecf6a93907aa7108fa5ed83d15f28d5c510e1045beea26c70291cbe6bdf83c3d681b91b23601d8abc253830ce9b SHA512 ec056552194deb660e78219d6b13c991227bb403c06ae97e9a72fba8405848b2cdc699ae9ac8bbfdc665aeaaa9ea6347139c1d2e0422dd491b641afc101c47a0
+DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
+DIST bitflags-0.8.0.crate 11128 BLAKE2B 37a574fa8201ab43b3c973c3bc74c3f1f40f7e9f4276fb90f3410582717cbfbec133204eb73cfa37d3ed7d22049bd5c3a674bdc8864a378352fae0e2795595e8 SHA512 ba937c04956d0d36ee18faa37524f86e9ab5224e89172e4183b0a36344333a99dc6050e41a5c4c7f77829aee831acb5320c4a9c2ab06b4d35e76b315d980a846
+DIST byteorder-1.0.0.crate 8450 BLAKE2B a9a4bb6815c7e8eee9a1bf8025780ddf81bcf887cdfed86926bba70853f647cd3979bce0ac5b3406bdd5213969ce3ef82cbaf53ce9d2876a290bc841e1298ea4 SHA512 5122d3112973e96cb00211ea586e991cb0db18df4ce871d24e4d4ae12bc6630f6ff55ec2e3224fb6976afab0a6f7fb7913b8280cd991cb0ed742dd446defd12e
+DIST cexpr-0.2.0.crate 14067 BLAKE2B 7df29661404787696470c4ff1b0fc51a682d237e9ffbcc8996ddc263e948810d35d9e2b9ef4748702e00fd67b470127ebaa05eb4a4f75641ac8c83febf0a34cb SHA512 44261e3a96bf36bab0ddb5bc6f3e4e076dbb3fe2d3357cffc352f84cadca7a659cecec33de46cdd23c14a8a62864038dccb4d1667b9fd70a22753c48c9f34962
+DIST cfg-if-0.1.0.crate 2758 BLAKE2B 8ba4ea4deb8cfeb4927edcc9112346650eb9b2f5ced13e4130aed6c030f8f7bafdb50ca4b25f2124636058f09ab76f70f6a5820cdf31186b5f5699d7da4db03a SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb
+DIST clang-0.15.0.crate 50520 BLAKE2B 60fbde8b9dcbd6551edd21332af088738844db1fbbca7e76cec618d866e8dbe094a347216990c504a152b4e65f7bc37d0d29a9d9158ca03888719cd586ed3d84 SHA512 f51a06728d4b936f606c52f8a43cb3d34aa8611bc28ebd8afeaaedbcb7cd9cd56274c0e421d5dfbb584616b63ffc25295ca0f59b13bf028d3d286374a9003ed7
+DIST clang-sys-0.14.0.crate 27025 BLAKE2B 6dd9507ac534c5155e482051e521bc47d3c773d89531b325f7b1cfa66b0d20df82f440b7a9cb8047eb6b74942118462583f1141e27052c44fc8c1408c6715c28 SHA512 fb759afcefafe7e0d5c99fdfedbad27462a5af38e89e05cf93da796e8a2074be11a6ddeeee48a3ef54a1342b0a4182512aaa9ae3a0d3aa1d20d21b31b70dd8a5
+DIST clap-2.21.1.crate 172811 BLAKE2B 4a07245cf2c97263ebff0d66ed5214318710d6e695f9c597c184dd51df98570d207be4b4db5edf62d77578a2b3b74550cb1a36b63f4d09779cf11781937f4dde SHA512 35edd90a2f21b87dfcc39a4789ed9811d84e0be828caad24e745b8bc73b8745df3f4b29b423e51a6b724e5bb82f8cf2c36a9feae5e243b211f5529c30bde0e14
+DIST crc-1.4.0.crate 3443 BLAKE2B ae750a28d8ffdb4c5dff289a917e4238e68b99a6a25599029fb8837ad26538c401dd22a0d1407508dceb9eaf52db81334e3dc83d436aed4cf48804890a95c599 SHA512 f031f977bfa755222e1e73568979224c12d71d53b7da1910f73e24794067e19ed38995385cb0360aa827ce625301f9facf53cb996887fa3fb92a0698a1a6411b
+DIST dbghelp-sys-0.2.0.crate 20721 BLAKE2B 15b49d667e62f7182cbb2f413459c872489e68a8930591f56e92d673df4919a0a78692ff14dd45beef6ea01ec6db562d052f135d275dae667d51763ccf754023 SHA512 83588245f1df7db15d0c1b0b816e183c75238bcb90776ce42d9be4a9f06c64ab761dc10e2b3da566cf0c392b22acca60c96a8a40f6ef95d4d3f3f570af3f3d0d
+DIST docopt-0.7.0.crate 41313 BLAKE2B fa6503c52765e2d687da6c8edf1d8b5d4e73e46ba6307611351189218e00b4859f5297b30ec0fb30a2334c65a3a9f4d0b869661bf97c0b1783fb6d4bf8da6996 SHA512 f95549388ee834bdb3bfc2615338990e2e496b1e5059bd92376af5e3a173c365101c5fcc7e82a3aa0ee67ea8362ce98e19df4f02bf65cf14287d61e68299be09
+DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
+DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
+DIST env_logger-0.4.2.crate 10386 BLAKE2B bb45c1b965c043b0c9a351ad70a7642d66094424b90a61c4e87510407806e07c764855472a06fa0e9dbfd3d56b30421f5b01ab185cee3ab6d3f95f0bc5d30fe7 SHA512 97d73292892bdc9439252494ccdf27e27c5871637ec0d6053dd8eef8df71913baea54ae45ceee3dcf8425a8be797f136957eece69eb1ecbe876dafa74c070703
+DIST error-chain-0.9.0.crate 17627 BLAKE2B edf874f642662fb474e2ff809f3a5b8b6c722cdf54e108b193e28bec85dd463a80e8c235ddff5b0571eeef1f4b1cc9d837d97d1eb19467b4904196d35dc16452 SHA512 c36dbe13e582094b250f7427768a7d9e432d82fcd7ae3d417a4140021a5c0e96ebc35aae97a7addb2c55c8309dbb2a6a71a3fe800281b69de3d4a9c7503dd459
+DIST flate2-0.2.17.crate 47795 BLAKE2B d6bcae7d12040f2fdddc33828e7c66ee8de47469c4b808ba10239ad3b31482ddeda0f39678a6660410a3772afc3546c03aa4050ca6f83ac532f051f39b8fe104 SHA512 609f2e3c71e8889ccc3682fa62ecf52a068c1e61040b2e0eebb7b8de7784dd595592bdef34c7a03e0587cb3e4c2e2d8de88eec113122a222676cd4fb7d8cc775
+DIST gcc-0.3.43.crate 26087 BLAKE2B abd5bfd81c628a2f726fb3fca90e87c87de8a78d58982b1db20b26dde2a182a708c4e30ae2b0714aec8d8d85c9e0af508b093e1a53a7ab9b41543d4dd508cc10 SHA512 27dd847b9466140d8cdd9bd4ac466d2ba26a93f858fcdcc1d58a59b08207f34f283004512faa53c4d8cf9632e0e9199c0f42db6df1db9a8d6b96e72e074af5e3
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.4.crate 5768 BLAKE2B 8e022af18457ba9e070fb4a1b5a2a5b4d2ba1cb68e8d20402d79a7dcb142f5d5ae19fc2b666189b8e2616b0251f498f9f262e629a0acd9d98aad0a163d76d6a2 SHA512 80b0168325a70ab11e86f6891ab442e33deb31c9b091d095ffcf5149dbfac7569f5bf5bcec643cd98d9d1ec2f6ebc2af52df383b033efb1559089f128e4d4748
+DIST libc-0.2.21.crate 132909 BLAKE2B 849dec2a553278f1d8d4b60f8c8092d146ce2e2e89432a643114c2b12ed183390c307206ab3f847242061f61a88223416e437707810085535123b7ccefe56408 SHA512 987cb36af3e333ff93a79b0164c24ea481aa72354a9294e9824fbb29bcb4ecc4fc95f68315c5831fc2d59521cb395825e7fd400ca943f36f5dd30b595c34c1bd
+DIST libloading-0.3.2.crate 14013 BLAKE2B 210bd0c9a4db4f79f094ab89ce5de74f49fccc93c1c4650ed2afe563ffe851795782bf9a89e273c50ae32d8568dbe0551dfadf766cb3d3e64341649a839bcb57 SHA512 4c76cf02f4001d9eadc39f13c82de4531c3ef14b72082efec04b10f0b6bf5fd0fc1972e76e268d0d6ee34a9d11e023ce501f347500f19a60be13e83fda101397
+DIST linked-hash-map-0.3.0.crate 13693 BLAKE2B 1d533fbe24475d831d22b64896a8e2ff7dc370c797c1fa7ff2fa6cacd43a87d08e68283436347458c4f047c938a5e45048b5f5801204f7411fd775e5ac7cf1dd SHA512 4e93c0ac9fc64beeb3b800ca09d4c701f7fd35a866c174588a9d174604d5b820f43c21d48b4e00143770efb1046a053a28004258754930f2c4ed76b2ff8ed8c2
+DIST linked-hash-map-0.4.1.crate 15510 BLAKE2B b86a61032445ffabffe5b04bc578991a0c909806fa59b4a8c3b289237824dced1a25767a1c0986c645aa6a7629bdd3ad73232f92810502e5df4becb6251fd7d9 SHA512 85d22f25bdcfe1eb3dbbb688a6436d519189ed78598348efcb53f40066ffe62962c6d8030b6f1f18ed594abd9270177abbf65c30390954eb9d0cb1ac8745ef17
+DIST log-0.3.7.crate 16352 BLAKE2B 3cf2ee7179bab3535f632ef0447929e4c4af73e74c5549857e615dbf830198f5d5e9357406794a5aeda39d963737db57b90af02a6b499444b82d778299792d88 SHA512 6befd815071738e24b62feb8f45de23d9927406dc185f37c63c0d9141e315cc75077194dc8e8e1d3cddb279836decfcbf077346a086ed7673b43b4aa512e0dfb
+DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
+DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
+DIST miniz-sys-0.1.9.crate 53242 BLAKE2B 1259dae3c0c1d37c68e947f9f64e8c4044ef7eb6d900cc8f6a8ef07a42454beba4565885c301021cf925096b605fbe482d22df6c6f9b44a228e7a6fe468ad7a8 SHA512 130d872d25ca30937cbe34d93c6c3be359b4613c192b2dd8c542c0f3c2893c15176afc84da8e9077368647bdc0cc584aa995b3cbc8927b5e7de059b6135be709
+DIST nix-0.7.0.crate 70639 BLAKE2B dd849d0fb540ed937d508a7a73079c6a955488d7b4902bd32ed15b08b2e740afaeb98b00527a5e2997e2aca79013bcb9465ea1691fb620bdc9a203533ab4e162 SHA512 ef96fc40683b9eca0df38f573b09a4986518f810033cf810915e60eaa4582494113280a1f17d25c1e363a02d8e2d6328cd8a6157ba5b35fe65ae80456bc08e77
+DIST nom-1.2.4.crate 68547 BLAKE2B 87ed1c1770772beed7e2b5faf9a63ce4ab506913ee104a7e36bd64a69ebd47b7a7bea2ebfe1cd14a54e87cc671340b6768cdd47de68f163e48253f02283a13ed SHA512 4a1000f56dedfd71b1f91d44c27c07519f81629f5fc24b469d179d59e8b3305c8ae1a418fa60193be1cb4289887af2ad9b9791dcbf1f6e7a5eda36171a314539
+DIST num-traits-0.1.37.crate 20492 BLAKE2B c7327ac98110871c9ce2896653c8b7c7e3ce04b966c7e97f21608ca12d37cd03e771b0111a6e7eb2804055bc87f13f38709130e81f1b559d0ea40182c6f8e2d6 SHA512 290c7ebc5a0249d9fd937350b854cd5d181dd0ca989a6d9b3d5e05e438343083f40261b4e151f3ce5546e9f9a404cb091b587bb7e1e193fbd26c3317b122c2b5
+DIST num_cpus-1.3.0.crate 6779 BLAKE2B ddb442d73b2d49926c82beee263fd34e5fc7dca6b835c51f8d0b4444eefa75c90220d025acf1a2d99cec2cb02b957c76234dc59b1ed6aa56384f81c1bf3f0786 SHA512 000a17ed9c1e7b65697cd79658ae78b16816aa55ca7ba82ba4fc184f01543c01d69ae19c836f23c2fdcdd78034909e8b0db3e8fae581e220813c628ae56a8fe7
+DIST ordered-float-0.4.0.crate 5034 BLAKE2B e7b2ce8ea84df23064420cf2cbc9a7417adc4be7d7c88186ae1e183311fd1a5ac75fef9c48d5c3b58de3c4f1c205f8c4bce81f48365505b400357b22194d8a16 SHA512 c78385d27bf2744042ff690e153af56d35e88c0bd6fbcd4275e193b99b4876187912aa7ca3915de9021bd870ec4c32c1efec45964ca72b38e04ce2b2e3d77ec2
+DIST pest-0.4.1.crate 39337 BLAKE2B 1512176371aefc05b67a4abf075d6b6319d48f77181b3c5f4764e793126f126977ffa4393d639c1892100c406cab27ee1394c517551670f5ddae7eee512599d6 SHA512 b23465a79e8390abd28737f9eb59327e7d4ac2104b5558e08dbb0bc4e2115e1fdddca72b9b1f0a617ba1c947bfe613305cfffcb527be204fbffeb8242f3893a9
+DIST phf-0.7.21.crate 3484 BLAKE2B 761dd595dd46ce61f6ea729c6c2c24d0a4c9e88744c837c70626f72d2c3c428c8753638493cf952cc7d731135aadc586612511bdb547c5bf77a30faef442934a SHA512 272ddb670e314fa2f01a7cbdc75d247ce71ec29bd9b23d3fc0f30575dfaa3ed6020d64b9506e9c6509a8d132b9ec5da3cef52bebcb752bfd2d4d2b4e7a778da5
+DIST phf_codegen-0.7.21.crate 2498 BLAKE2B 2c0185145708f13a9c1cff39f5a291f9cc9ecf8c2569556865e749abe84a1fb5b08d57bfc5b1d2758643dcd292477d452153a6a578c22ac60833819dab91827b SHA512 4256fa25c9472a810cf6acce07287aa36c2247b40beed1be0e0e132268e3040471d35ed5103bbd2880410cb7da0d1153c045fa28e851105798281f5f2361a310
+DIST phf_generator-0.7.21.crate 1821 BLAKE2B 45fc1498c3e0cf3cb7a812c464e8f25967a59cebe2eb62e89d929b716c0b8796693987c3b49611a9d34de821abdf382f4ca28afe5a0824794110e1d80d18d7a2 SHA512 853ce3bab9119225076c1347488f0aefb7cba398d5c0be572c8bc1ccad8875ec6f86a0eaa998773b6ad3788417fb2c6adf78a3b778f36dfa5236fb31ed304c3f
+DIST phf_shared-0.7.21.crate 1692 BLAKE2B d6ca917a7d2b3a460b0adb406c359fe253ba3facdfda526017385eecf04436262fa214ba03bf9e949f61e20c5be4fbcbaabe37b793916e5a3a28221ad5b85fdd SHA512 ac92bbbeaedcbd02d3e62a9c7d0c6f22abeeffc5c7527c764b3e9138a2821dca667a1d3f29178e812b6d81ac50d5e6562b929650a0ee66fbb8d1c15366ead279
+DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
+DIST protobuf-1.2.2.crate 168801 BLAKE2B c59d8e4bf166ef0daf22db4c5aaa22b7f81ac80b9133183bebfa9453405ef75483b29870840190259a1feea3653aa2600ad2db3a008391fd64bee0c70100bce1 SHA512 8134ca41baec01dd74a108bac1e636d2ee78403d6fc9ce2330724ef20dc8f713a7eaa7d006952076141b0ce4842ef771a99c3fa42197ea3ba0c6ecb3eb50db1f
+DIST quasi-0.29.0.crate 4115 BLAKE2B 4205280a10210f29e891ca880e7687b87ad3961914cb721898420b947d621241e91ffdc5a54ae5227336af9036bf5aa19608c3ae3af99f4f42a9e5a9cd32cb8f SHA512 0a2bb45a964a0c806969ea51c58636affee66c54ec9c952a295c0b43f57f106ebbfe2ad7188be9e35f39fadc17999b1c91be66b873131f04b04b7725488125f1
+DIST quasi_codegen-0.29.0.crate 6838 BLAKE2B 2c5aad5d1f88e637d84e5cb3cb2de2e046b2e32f650b843e3c7db6c0513fcac5e568a8c74c88c8c6184dcbd33921f331429b61360d0fb9f8effdd1d858ee2714 SHA512 9eaec0c3d60b78b09f569fb0b0b0eea36ba72ce0ad10e1ff9a919732debfb7d45c0a0c82f8a065e90491d6f0551f59892da5a46695aaf906d0043d983e33609c
+DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
+DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
+DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
+DIST regex-0.2.1.crate 189277 BLAKE2B 25ab16e2dc191db7ffedbb741bc9fe579d2197f12fd3cf717ec393aa39a433511a8dd30c0a0a0b13c05deb205801003428516cc2d7a51c5a360f8257d5a5c9a1 SHA512 d098065bc8365e2ec584634bbf2547b89f51fc08825d10cc26fa6b8c81213612a552420fc16ebff322637baff95669552bf95400cbef0bc9a86fe7e0bed9a0f4
+DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
+DIST regex-syntax-0.4.0.crate 118223 BLAKE2B 218847fccfd9cbbabf3d56bd6a423b46f1a5b841ebcfec086ede1e591389b6cc6d97c97fd614f27c8b2bfd5b3af57096fd4fbb512b692e4c5f429ccfa32884da SHA512 c2167926c7bc383c71205e607f21490f434b90a0802eacecd0805c9307bf58cbfa7437e1034f96586e472dfc09d63b2907b4a8179321efb38365b4029458616b
+DIST rmp-0.8.5.crate 19960 BLAKE2B 96b29bb54dfd23a0980b6e5ccf1594262d54a0942c2f8c41952ba11f2f1397c01522052e350d1dbb6ecfaf185444436198d3e7110050d8c0bf8272a8b668f314 SHA512 d894ed63d277be765d4dd39b7751972c8b4a801cec36e48e65a39d220ee3de6b20b0654e7dadcd77150f8cfaea2ea6a4bcefd3e89c65d5f48c1278d4491776c6
+DIST rmpv-0.2.0.crate 13749 BLAKE2B e1e6a783a762c53459b9fbef1382f1289e5a60bd8a83534c423765e99c3a186416a0cbfe320cef68e4a155e237717f487d9d6572b4cc8c33246dd05471c760ee SHA512 4f79974e39bd5aeccbc26e8123e1ab30344c5d5f9396807ec8be3a7efc8a9ea692ecfa72a2aa309f7d1d4b12da5de7695984a0bc09f6086c2c2aa48ebef3ec2a
+DIST rq-0.10.4.tar.gz 2831387 BLAKE2B 6cf778f37c955c203c0a49983933a0b380982d55dd57d467f68bbe60f59bf70eb79dfd7a5e0df75b6acc5ec306e0277b1c1d6fe120b973cfed7c2315b2efce1f SHA512 e702b4ed082625b856b71ad772abbb7caaba117a686ed72e3ecf6a28102c1f3d2a535d1c8c0b7ae0816e88dc3e3416a4a676785f01644dac89319320cbbb9d41
+DIST rq-v8-5.6.222-i686-build.tar.gz 401175081 BLAKE2B 1faf71d2f279772edaccf797e5f522623443b509786b3788f1be4715878ed025092dbe8c6c6b8885836f78bc72b4c8b9744384fed236ba736136839ebea0f346 SHA512 b3b89e3299c761c9ef087322d2f255eeed0e52faf51eed580847c0f26f69405bcc07b07499c80ec814f976d702c211c8a6fb19858fca1ae8afb710d75c4b68f1
+DIST rq-v8-5.6.222-x86_64-build.tar.gz 435523225 BLAKE2B 54fabf9e724ef86c9942ed1fcb6c3a07090118e7ccc58d9c57bbb8b84d0e2963e3efda0f55a3a6a0a98564afe8e29136aa799a5c14dbdc508c5c6e35a9d7a4c3 SHA512 3f54cdc19ca87dec8926379bdc5ebe6c9fac6304f5aa15274f89f51baeb692948de27ee41ed7ac689a2b50a070feb2fe1d7ce61f27746cff645a48f533fd65c2
+DIST rustc-demangle-0.1.4.crate 9438 BLAKE2B 695a8e529090ee9293a2d01339a0f0d4011af010f40964f67ce862dd93c71643e468f4d3a2fbc83430a8ad775a824ae56cbdf59abd4808c7696f76446518f91d SHA512 928cf5537343ad3bba3aff4b09dc51921b6823dc7a450422b363cfcb84ba65e19393dbcf67657197cf96fdb4b9b0195f42b3973473f51085610c90c8b49c4e9a
+DIST rustc-serialize-0.3.22.crate 45545 BLAKE2B b367550233def2244b15cfffa7b089a0771e99047f477dab92a44c3b228b8879b92fba3f76998e9f6babb5b0a0ea8062f619bc8d9256f6e8edbb1680a4c548c3 SHA512 833649dc82e0a568eee051a37856983aadb3a33ca5d20c02e6ef057c7fad802c19d3131cc7108b33b098a964a2492e43d796f36b600fe3df4c93c76c9abb219c
+DIST rustc_version-0.1.7.crate 8816 BLAKE2B 1c3cd80bc3204d27a9a09f4ea8dbeb1624decf9b39ec9e78276fd50362354e59a5c31250c01d136cccb7c717655765d6f2781ab7e04a614f55bfaf334962784f SHA512 f7ceb913f93444bf98ff8113beb96fbd013ecd6c0f31c49aeb738f418f2e5a958c54afcce6e5d017d66a2b47e07fee032aa07b0aa748cd3be67e672cf48f2b48
+DIST semver-0.1.20.crate 15876 BLAKE2B 33cd644289ac054c0b2423373e4539d95c494f21e5c3a8290d9a8521b25e86222e7abe697f504a4acad0e6caf72754c211f0fd0b3feae69f7dfa98d020158968 SHA512 d24401aa4a1e12472c799fd9d2f50f5965e4d2d4a5eccbd244a3f817797fd58cb073b933d45415a1a8d71084deebe04c2277c435da7f359e510c52133bdaa08d
+DIST serde-0.8.23.crate 25824 BLAKE2B 96bc2e07504202ad51dc20cd972e7a3047c26f2dc892d6892466e92c8e9a58a65664d9a5f6f2d38ad2c9e0bfcffc0096b913b6c5ef1d3736d53114c13f00663a SHA512 537761d0fad243799c63b742b9ac020195ad5575e346080c2cf19b1792d2026bdab6f61550679b8883f7af5e16e98289aa749f0646a6d4b0cb24eec0f7d92edc
+DIST serde-0.9.11.crate 52571 BLAKE2B 7b3c3611e0254e4c8eeb64a2a69ad5f0623950aa23e36557faae6a48799f6f3b4d843da9ccac8970fb994c71ed2f3f6369c68359b281b918047f4ed7c1de4d53 SHA512 985ff9fe37e16289c6841296f7c98d1e079f33e503ab9d5f51145d0ff45da3b6367cf373a4027035521674c5da327bfa38c2afd342b5faab3d4a9ca44eeed2c4
+DIST serde-hjson-0.8.1.crate 23130 BLAKE2B abd3c64f47716a514ddc686b2eed6aa108e437762cc4e7b251fd27037123b002c9c02ae4f31a28a498722ed1f0754e19633bacb85a0fa9e4ca0fb67b691de441 SHA512 6035b449eee70ffc7cafd2d82eb68c7aba79e25ce8cef56e1fefbedf66109ce4ac2a3bcbeb7c8f6f1f8af7c5e29a24be7a7455ce3a63c5b4ac50e436c0bbc718
+DIST serde-value-0.4.0.crate 6978 BLAKE2B 6493defa18676730592bac478dfa08945957171f65e84db36491eb0a9fa8f054586937eaf191b0bc4e74034c01c99fd56acd9591f2b88f940733794453423e11 SHA512 5b8670cf2bdcd93813609a18112a6a35c1a59863c810b8febd4426fe6cdf84ff57b78b6fa31815d2b1d02c2c8b355302864c58fa99eccab0c4da07ab4f34cdad
+DIST serde_cbor-0.5.2.crate 20389 BLAKE2B 2da66e9d103aa8d34020c49a80781900a730ad827a616faa8de3f1250eb8a6b8b20e703b9b58aa3d41023796fe3e2dbc60da1cec2fe6e650319d21d234a8f0e3 SHA512 c0cf7d0441afc0cc7a03f8ff31fd836b4ab1dd42005efd4c72c4dff145212a40fd77a3e5212bff95c64f32e9115f8aa012f8cce2fd6cc81dcb0f2b2d3656af3f
+DIST serde_codegen_internals-0.14.1.crate 12211 BLAKE2B d41b24afcb11fc5a4ad1e325bcd801bc5c9d0565b695008a7fecedde682650a06a29e8881a4ba162a363e47434fff328f48c200f376416abf2fade7f1bbaa502 SHA512 db3407c83d3ef0714073565f03d04256531547d9821fabb6bf0d5e7ecb7d1afbf3e70b1644683a063a116a7f0fc7fd3b5761c13cfc157d2bfdb7fd72b31b115c
+DIST serde_derive-0.9.11.crate 19929 BLAKE2B 49ceda14a1c33171f0cce1fb544194a35e173d9e170bf2652754ddb658132c9684cde66651f4cb43837709f78f19774d3b83bb0541846231113b86690b348093 SHA512 f8855892337ead9f4b8ba541b4980b358f045a63ea2923709989e61f5c23c8327e37114dc3724a17113d89027dda03c3d408fa3e2270a9b61e57837852b25311
+DIST serde_json-0.9.9.crate 46711 BLAKE2B 275a3e9b6a33ab473dd188b6ad2bea699be540bb2eb335b3d4f89e0c01c82c06ae58628055782ecffc6af6d712d68968e76c377069d245cc2395bffd4513c0ae SHA512 cb1a1f3ccbb8aed77d92faedbc679758ecb9ed2d1e73fe310638006c42c48a3dc7b8c689699e379f94c4f155e94c5692579bf003eb341d3f943d46034c0539b4
+DIST serde_test-0.8.23.crate 5068 BLAKE2B c6f4fb735796e3c9832f9b257aec426547a37a8a410a422a2e35b95928c66a923f92e221981342fe3516ecdc9d67729fc35fb3810a727cde61abee3a0a69215e SHA512 bde1913e885d47eb1f96b352baa3f6d4f0771fb9cd35e3d0e6a43a1dfc9abb6e58a2191947d8e3c75ab6023e7ae17c6ffa5ac89c1484099ea30dc248e59c59dd
+DIST serde_yaml-0.6.2.crate 11451 BLAKE2B cd632d56ee89cca6ab00da3f36f2e39350306d058a8c860e1ce7a5a9de193a36287629f3aaa9e849a586823d3cd41379dd65b9775b58edcbc15b4bcdae405d06 SHA512 bf6cac18984d5669a91644f0d4a074c609a94613e23359240a5c79c9ad3861b547b1795915e886c3b2345fc326bd52d991441d52a58e52b14b9c4b0f1ec27939
+DIST siphasher-0.2.1.crate 8339 BLAKE2B 52b83bd3d97a4e9b906abe5c01e607907c44c291b297572c7f8f5b2c5086625e700b0a36a5364049a2b35a4060e0e08af2dd418fb60600bdcc18488c642d5b6c SHA512 3e44112c5fb82e9fe21a70a9aa8d4eb4dda22c4c7f59c165169c2d6b1f642394587adf1bf506d4493ae2629200e6516d998fa6a24c24e27b1a70d2680c723ca4
+DIST snap-0.2.1.crate 1072209 BLAKE2B e1be5fb62c9af3a426d0347707de5bedb9f8352427686cd5ab5258d7fba8ba64216cc04729ba267a015019b8b1c63e948fc8f140224ffe7abc9d5cd2c867e6ff SHA512 751e15ed5a969ead2645ecb20db2761666c757f6d24b6053ae625d9901e926480a0a6ff209b5e800f98d1d2f4921d0f2e791c1e17ae7ed0b26aacab439f06079
+DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
+DIST syn-0.11.9.crate 62342 BLAKE2B 48513619cc2bb40e9ba713d7badd5bc35315de1cb467513288e3a62bab63d9aaea6a6a9c8cd5ce878027b67b4968b29c03b949eb72bf32b9798d7af1ae0cfc12 SHA512 5df6189f9a3ed0633b1941ecbfb71bac60837d577c5abe523172d9985c809d98d4732662bca7c5c44636ea4c3f23418af74e17238dd0506554a70b3f865f9e14
+DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
+DIST syntex-0.54.0.crate 4170 BLAKE2B 08197712b73cb2a002026e69ebdf22114edfef94bdb09bca40ff86f337062683d7ef8da680b0cb84f320455f038f7d9eab9c876b1ed05351517b6d77497d360a SHA512 ebeb722ebd11c0e87e2e7ae3b8adfff9e29f0057320a876d72aa1eb547c9b85097ee252f54561cfb84112b120a9c3bee93c082cc8a37bd307627d08f4dcccdaf
+DIST syntex_errors-0.54.0.crate 20743 BLAKE2B 9e0cd591d8bfbd5a72ed3f29f231e0b244386303e42def8912ba499cdee34a6ea2a1bf363701f2ed1fbba5a0f659dff1a2ab35739d6cbd286f61e621d8faaf0a SHA512 739ffd41122751af969c069e49fa82b8eb8a026c14e11364d37d71e168aeaadbdd692cd12a3bb3191eef1815e7022b38727863c90cfbe8739243e1e82d4014c4
+DIST syntex_pos-0.54.0.crate 7297 BLAKE2B ffee038458a16e615893f423c5388a20a14ae3ed616d0f192928d70be5cf59fc00b9d75d520ed66f15309287553882e04b9f45770efd8cb6292534e6d3869623 SHA512 8995a3e67fa391815868350f8043b37983ec7fc14654382191928c6033cd4334735cd49012b41cbc23661a120c35f1257f7d1f9147cc7cf3b65ada4228e32f71
+DIST syntex_syntax-0.54.0.crate 264005 BLAKE2B 58ca5bbb7baa6dbabc97d7c759ca8e560a39ad3296fc700e7122cfaab383009bff8bed66c543ed5e0ca188ebf54a214042cdecec0d00e7bd4103567f4038c170 SHA512 bb781bea73fe9ea2fa7d1865d573f311645da3a7d23aaaa2a4195ea10ec5aeae6ed0af3314b0e7c1bb1bbea344897ccf08ba251b907e9e4f7b30ed8cfac74f3b
+DIST target_build_utils-0.3.0.crate 7591 BLAKE2B 567955b4851aae82ef6b27b77ec772a9ce6272c61b76045126e8f05edd86580532f22cfaac819538f60d792bda5963add7c8aa53d2046e8b047138d5b45f250d SHA512 597e6f1ada25242d7c148ac662be31b0f878b54b73f10a36c1c7cee48567df6a00fce521cc57fd98c8afb1ac336b37ee2aac8ad36fdb3e5857b6eab8cef15c89
+DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
+DIST term_size-0.2.3.crate 9407 BLAKE2B 33b89bab0647b0e58b9c5375ab39069b94cad6b9b432d7e31f55269558c1e16613f89ef24d3f1731867ec430f9bcb221b16f4baa9227a618faf9e99e012e6075 SHA512 09a7e95e82c673b55b11acd18b9a7f9507247967f5ec9d8576aff91b2d64f68172cab8dcdd3a626c1d12edabee4f7b55c72db0d7eed3eb89d049e2cad4d59261
+DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
+DIST thread-id-3.0.0.crate 6240 BLAKE2B 50d203f52cf0116608c6ed92911f982779f7c2504e2e637bb9a67b2d8a2011888224b1f37bc5c81e4b6991eaa685f94dd9c596b654d827b5f2aa527be12a9690 SHA512 39d02053fc3b0f667e0a0e8d8dff26ab393d9fcedecf54541ff3cd5abd0fb25a445a4a72160e97fb36b137ca15f7e8e751cd8bc93d537d73b743049146e92bf0
+DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
+DIST thread_local-0.3.3.crate 10964 BLAKE2B 1cfdc1a83682243df8bd3fd75b00f174f6e07e7494f47f9b580704cde47c91650d2733fee331f8dc3209e6b1f199b26bd07aae02a3981c9769500ab791bea053 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d
+DIST toml-0.3.1.crate 54005 BLAKE2B 0cd9d68a3a12c723d31e4fbee27187012b6bf7cad042c2784a36b9a8cffc55e78346c50aee82a7e7bd2863098f4d570d4ac96c6a040080ba7bf3b167b7bfe7aa SHA512 5b605eb1d72a8132f2a1cd9005577eb24b1a93a597e69aed883a6069bec84138426cf7facdb922065dd57b66e5f6d7522a64a410d16fedf0394077b92103271b
+DIST unicode-segmentation-1.1.0.crate 65559 BLAKE2B f47ceef39a91927ee9d4ce9e21a542c1cdbb1b200127e0e8961befba58895f0ced017030ce21493c45b82e430ab9c9ccf46be0784148c3da87032d98007bb55d SHA512 1cac2212b05d196ef3109390a9fd902430d88f01a8df9a66367c2535ebc57546ba5a923e0b1262f9858ad5a6851e6aaf7eb22d20ffaf1ed77d38009e7af64bc0
+DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
+DIST unreachable-0.1.1.crate 1772 BLAKE2B 5d2400959e334d483f1b2a6accbc6641de33df02041d8c7ea23bb66cb0d34c9a911d70926f0849bd3004ff1683c3c212ab7877d6c3b9df535726ea81f7237a20 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0
+DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
+DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST v8-0.9.6.crate 24925 BLAKE2B 254095ff728b48265f785e85e864513044055e79c31aad7c9de8d73907a50c2bbfebba54a68b926bf590b78c369f4ed35e13eebd65f76f06165851ee41ba1890 SHA512 6e323da9db8e0c1a0b10dc9a47df81b04c97b3a2aa2da3908ee7f0ebd82e88eb1069f505dc56fcbfea6f9dd36ced54f1f434cbdd6876d7d06eda4beff26c6715
+DIST v8-api-0.7.3.crate 5941 BLAKE2B 65fed5ff71eee0b422c9fdba68b17cd7c24078c33b367dc6e03cd49ac818258fd41d83a3f6de50798484f066c287e570c6f28a52ece58a5469ab63df4a13fcc7 SHA512 0b079ed7629669e17e9d76a5596e6afc1508262f80d32866811589b0508e7dc7e5c5103de78de0db93e3238ab6fc1bed3333c15664340bd4c92cfa78e2e4d9c8
+DIST v8-sys-0.14.7.crate 12119 BLAKE2B 52492c766ae325a4619bbbee398e6726eb7f4fad33a65a88a7f47b0ce20805d4b5c3c8e93530de60387dd6d7fe251b244045425e56b27c72c6063223f9fd2889 SHA512 a67cc73634c065a57097a6f4a3cd242cc11bb1f3762b34a595b023ea981781d13a72f06e8111b06422fb9925a9b5a8d9fb067c18e6df89cd4c3934b919781d08
+DIST vec_map-0.7.0.crate 13455 BLAKE2B 11c03f332ee3ba7fb86cee22decb6990e4ec155d1a5ff0427911224d7c44e6c14a81d63ebadf5f0953caf1da67d4b35db2cefc70852afcad880ca9c2f83cc72e SHA512 ce4b3e1ed8a7846ff63dbef7051cac76232295c443f560d3c5f7b658a2123c7881c40ebfa90907d500d3e943beaf32b25c8a8068999ac7a28528db273f2e0983
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST xdg-basedir-1.0.0.crate 9720 BLAKE2B 96591a8491c9e86c1c0b568f80af42f1cb87eb41f34a71e3ca724379ec672041ef0c560ecdc7fac6076600fac303d0aaf793ee4bde103b861c52e3a1bfd188c1 SHA512 3641b7335095b72eb0701d1c287439556d92e3ffe230f61aa5b9e9cf4260e618f8e04584dfcff72ce4888688cffada1b29cf54b747ccb82e8737dadd9f40a30f
+DIST yaml-rust-0.3.5.crate 42087 BLAKE2B 03a1b273f9725fa991a1a1ca7060d879d333d44850f70d64acc76d03f3af08fe220ba9beefb8e6ff29a0958d5fe74d5f9780711ce9e5e3c4c18e8b41865024ad SHA512 0cc2a0f0b308e13c16bb2c3fc797eb1a0bcbfc285f0b42446359099c58a290a545d1589c09a2c779d5dde4f8c1f4261bc117f2df0359e281b995c7a115e5994b
+EBUILD rq-0.10.4.ebuild 2771 BLAKE2B 04fa98ee5ddc841f988af126b992add08f29bdf4a02e2bcda6af84b059c6e4f19017cfb84ee982bf7964f1287735184accbf1af1825f49c6df18e7dab8d7de9d SHA512 b71caffa51a4573e97156f0de9e87cf2fae23f15c448f3e74db24e1c4d345f66f1a98f04cbb1383f09bcd56af3c78a60dde64a84c3ec42726b7773f653c4dedf
+MISC metadata.xml 322 BLAKE2B 718d525f18719ba0a6231aa1be6f9aaac31a7643204d3ad4486cfb02a558d28237df29965bf123f6d48b8ce88fdfddf93e27bfbf50cd3d78d46e37c6ddcc330d SHA512 6ac5d6db417074c911c38aaca454ec46685d39ca844735198286e01d0df816b2f6f8acfd846f4faced029efc11943f9da1be871458b95eda136824d6bb4e5d0a
diff --git a/app-misc/rq/metadata.xml b/app-misc/rq/metadata.xml
new file mode 100644
index 000000000000..4f9bc1f21fec
--- /dev/null
+++ b/app-misc/rq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dflemstr/rq</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/rq/rq-0.10.4.ebuild b/app-misc/rq/rq-0.10.4.ebuild
new file mode 100644
index 000000000000..63e37a15cafb
--- /dev/null
+++ b/app-misc/rq/rq-0.10.4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.5.3
+aho-corasick-0.6.2
+ansi_term-0.9.0
+aster-0.38.0
+atty-0.2.2
+backtrace-0.3.0
+backtrace-sys-0.1.10
+bindgen-0.22.1
+bitflags-0.4.0
+bitflags-0.7.0
+bitflags-0.8.0
+byteorder-1.0.0
+cexpr-0.2.0
+cfg-if-0.1.0
+clang-0.15.0
+clang-sys-0.14.0
+clap-2.21.1
+crc-1.4.0
+dbghelp-sys-0.2.0
+docopt-0.7.0
+dtoa-0.4.1
+env_logger-0.3.5
+env_logger-0.4.2
+error-chain-0.9.0
+flate2-0.2.17
+gcc-0.3.43
+glob-0.2.11
+itoa-0.3.1
+kernel32-sys-0.2.2
+lazy_static-0.2.4
+libc-0.2.21
+libloading-0.3.2
+linked-hash-map-0.3.0
+linked-hash-map-0.4.1
+log-0.3.7
+memchr-0.1.11
+memchr-1.0.1
+miniz-sys-0.1.9
+nix-0.7.0
+nom-1.2.4
+num-traits-0.1.37
+num_cpus-1.3.0
+ordered-float-0.4.0
+pest-0.4.1
+phf-0.7.21
+phf_codegen-0.7.21
+phf_generator-0.7.21
+phf_shared-0.7.21
+pkg-config-0.3.9
+protobuf-1.2.2
+quasi-0.29.0
+quasi_codegen-0.29.0
+quote-0.3.15
+rand-0.3.15
+regex-0.1.80
+regex-0.2.1
+regex-syntax-0.3.9
+regex-syntax-0.4.0
+rmp-0.8.5
+rmpv-0.2.0
+rustc-demangle-0.1.4
+rustc-serialize-0.3.22
+rustc_version-0.1.7
+semver-0.1.20
+serde-0.8.23
+serde-0.9.11
+serde-hjson-0.8.1
+serde-value-0.4.0
+serde_cbor-0.5.2
+serde_codegen_internals-0.14.1
+serde_derive-0.9.11
+serde_json-0.9.9
+serde_test-0.8.23
+serde_yaml-0.6.2
+siphasher-0.2.1
+snap-0.2.1
+strsim-0.6.0
+syn-0.11.9
+synom-0.11.3
+syntex-0.54.0
+syntex_errors-0.54.0
+syntex_pos-0.54.0
+syntex_syntax-0.54.0
+target_build_utils-0.3.0
+term-0.4.5
+term_size-0.2.3
+thread-id-2.0.0
+thread-id-3.0.0
+thread_local-0.2.7
+thread_local-0.3.3
+toml-0.3.1
+unicode-segmentation-1.1.0
+unicode-width-0.1.4
+unicode-xid-0.0.4
+unreachable-0.1.1
+utf8-ranges-0.1.3
+utf8-ranges-1.0.0
+v8-0.9.6
+v8-api-0.7.3
+v8-sys-0.14.7
+vec_map-0.7.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+xdg-basedir-1.0.0
+yaml-rust-0.3.5
+"
+
+inherit cargo
+
+DESCRIPTION="record query - a tool for doing record analysis and transformation"
+HOMEPAGE="https://github.com/dflemstr/rq"
+SRC_URI="https://github.com/dflemstr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ amd64? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/x86_64-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> ${PN}-v8-5.6.222-x86_64-build.tar.gz )
+ x86? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/i686-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> ${PN}-v8-5.6.222-i686-build.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-devel/clang"
+
+src_prepare() {
+ default
+
+ # point to bundled v8
+ export V8_LIBS=${WORKDIR}/v8-build/lib/libv8uber.a
+ export V8_SOURCE=${WORKDIR}/v8-build
+
+ export LIBCLANG_PATH=$(dirname $(clang --print-file-name=libclang.so))
+}
+
+src_test() {
+ cargo test || die "tests failed"
+}
+
+src_install() {
+ cargo_src_install
+ dodoc CONTRIBUTING.md README.md
+}
diff --git a/app-misc/rundeck-bin-2.6.8 b/app-misc/rundeck-bin-2.6.8
deleted file mode 100644
index 6ae2f41858e2..000000000000
--- a/app-misc/rundeck-bin-2.6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Job Scheduler and Runbook Automation
-EAPI=5
-HOMEPAGE=http://www.rundeck.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://download.rundeck.org/rpm/rundeck-2.6.8-1.20.GA.noarch.rpm http://download.rundeck.org/rpm/rundeck-config-2.6.8-1.20.GA.noarch.rpm
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1733d05f8b2dee530d7a2b2fa9558f9f
diff --git a/app-misc/rundeck-bin/Manifest b/app-misc/rundeck-bin/Manifest
new file mode 100644
index 000000000000..c47e59661e7b
--- /dev/null
+++ b/app-misc/rundeck-bin/Manifest
@@ -0,0 +1,6 @@
+AUX rundeck-bin-2.6.8-profile.patch 1584 BLAKE2B e173e1b3688ac03e03c1c1c94285b7ca5aa1e1180d3d7adf5733df066bd9d898b5f0318c95e41704727519c7003d5183a75cd094393ff39a949fa09c3906dbda SHA512 f238ec1e7def87b214b5c1a940776705bcfe0f9d43d072a48a800f58ebbf77372b2b070ee18e43c0f2a2746a0155014cc5b41fb47fa967ab7499700489f4fd0f
+AUX rundeckd.initd 452 BLAKE2B 991239e09590f82b0b5f45c2f17700479f2e5fc8f0922bb255ee77cb64474c141d882a3f208ccbca8f81e1373238a06aa1105c47418078311e2224891b39ac01 SHA512 2c63e56f291a413c0328d036d8e8172112d1ce58a133f8b7e3a76aced774e0640e03b0b2f365870bec38faf753aa0c4090dc4813c1cde13a2a444d465476554c
+DIST rundeck-2.6.8-1.20.GA.noarch.rpm 101053077 BLAKE2B 44dc66ebbeb105e4ed5c198ca2cff9e69a03a226e43c0e68898a225955aaca471d1ada163962e25dbd3de097aa7582a3fae351d44a9740f1e46fc64526575620 SHA512 15620e306c10cae09eec95c43207cf88ebce69d4c7fd70289fac7f2f580343c623d77605f3dd5aa98cc882ec3512196aa431a2ff72e453780b415d19ee8bcebd
+DIST rundeck-config-2.6.8-1.20.GA.noarch.rpm 9460 BLAKE2B 97f943904ecfaa6d7a07bb7b8635ce13184f78fa3f042b5db8a4509d558836eda05772724e5fc58864a776900afeab790bbb6c86754e0f19dab12de827fda2a4 SHA512 ab4b9933bf942706cc1b8184375122d3e122e960761582d7b00b2a8981dc9b6cd6442ad8e65699db9e80e0a64b921f2916527f4c2263a58f70363e63a99b95d7
+EBUILD rundeck-bin-2.6.8.ebuild 1277 BLAKE2B f5ed62450c7331c9e21981258ee1b2ab67c8a04c442cca015279422189473d6654342a08819b2df3fe64e9bf1c1d3bab9280d7bc7d452a9cff27346780195d9a SHA512 e8174725622e3a8619194c50918ac68e97dcecf312d0d1dee3596e0cb23df1f195c1dedd5a162d75385dbfcbf3e87801b0581e4be7baee2c806d8a200ce93f49
+MISC metadata.xml 446 BLAKE2B 67031aade4a42706f4df737979e8638152084b91e5428d722771dee17a6ec0cf8b47d4be7e0f84d9e2ee48d3b0e72bf16681a1522cdab5135a05a8d875a1d165 SHA512 920ac4a31f6d230aa42afb98a197e7faf6cf13fc7ae77cab7824ab9f6ceac6aafd0b12f7e1478354304b754924f70d315ef06dba13ec51c57af3ad65154fb54e
diff --git a/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch b/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch
new file mode 100644
index 000000000000..a9ff4acd0a4a
--- /dev/null
+++ b/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch
@@ -0,0 +1,55 @@
+--- a/etc/rundeck/profile 2016-06-10 21:37:22.000000000 +0100
++++ b/etc/rundeck/profile 2016-06-14 00:02:11.630959252 +0100
+@@ -1,27 +1,11 @@
+ RDECK_BASE=/var/lib/rundeck
+ export RDECK_BASE
+
+-JAVA_CMD=java
+ RUNDECK_TEMPDIR=/tmp/rundeck
+
+ RDECK_HTTP_PORT=4440
+ RDECK_HTTPS_PORT=4443
+
+-#
+-# If JAVA_HOME is set, then add it to home and set JAVA_CMD to use the version specified in that
+-# path. JAVA_HOME can be set in the rundeck profile. Or set in this file.
+-#JAVA_HOME=<path/to/JDK or JRE/install>
+-
+-if [ ! -z $JAVA_HOME ]; then
+- PATH=$PATH:$JAVA_HOME/bin
+- export PATH
+- JAVA_CMD=$JAVA_HOME/bin/java
+-fi
+-
+-
+-
+-export CLI_CP=$(find /var/lib/rundeck/cli -name \*.jar -printf %p:)
+-export BOOTSTRAP_CP=$(find /var/lib/rundeck/bootstrap -name \*.jar -printf %p:)
+ export RDECK_JVM="-Djava.security.auth.login.config=/etc/rundeck/jaas-loginmodule.conf \
+ -Dloginmodule.name=RDpropertyfilelogin \
+ -Drdeck.config=/etc/rundeck \
+@@ -36,7 +20,7 @@
+ #
+ # Set min/max heap size
+ #
+-RDECK_JVM="$RDECK_JVM -Xmx1024m -Xms256m -XX:MaxPermSize=256m -server"
++RDECK_JVM="$RDECK_JVM -Xmx1024m -Xms256m -server"
+ #
+ # SSL Configuration - Uncomment the following to enable. Check SSL.properties for details.
+ #
+@@ -44,15 +28,4 @@
+
+ export RDECK_SSL_OPTS="-Djavax.net.ssl.trustStore=/etc/rundeck/ssl/truststore -Djavax.net.ssl.trustStoreType=jks -Djava.protocol.handler.pkgs=com.sun.net.ssl.internal.www.protocol"
+
+-if test -t 0 -a -z "$RUNDECK_CLI_TERSE"
+-then
+- RUNDECK_CLI_TERSE=true
+- export RUNDECK_CLI_TERSE
+-fi
+-
+-if test -n "$JRE_HOME"
+-then
+- unset JRE_HOME
+-fi
+-
+ umask 002
diff --git a/app-misc/rundeck-bin/files/rundeckd.initd b/app-misc/rundeck-bin/files/rundeckd.initd
new file mode 100644
index 000000000000..f9afeb656479
--- /dev/null
+++ b/app-misc/rundeck-bin/files/rundeckd.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/rundeckd
+pidfile=/var/run/rundeckd.pid
+command_background=yes
+extra_started_commands=reload
+servicelog=/var/log/rundeck/service.log
+start_stop_daemon_args="-1 ${servicelog} -2 ${servicelog} -u rundeck -g rundeck"
+
+reload() {
+ ebegin "Reloading $RC_SVCNAME"
+ start-stop-daemon -p ${pidfile} -s HUP
+ eend $?
+}
diff --git a/app-misc/rundeck-bin/metadata.xml b/app-misc/rundeck-bin/metadata.xml
new file mode 100644
index 000000000000..361b8c439fef
--- /dev/null
+++ b/app-misc/rundeck-bin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Gentoo Java team</name>
+ </maintainer>
+ <longdescription lang="en">
+ Rundeck is a tool for job automation.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
new file mode 100644
index 000000000000..2241a0bfea34
--- /dev/null
+++ b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 rpm user
+
+DESCRIPTION="Job Scheduler and Runbook Automation"
+HOMEPAGE="http://www.rundeck.org"
+SRC_URI="http://download.rundeck.org/rpm/rundeck-${PV}-1.20.GA.noarch.rpm
+ http://download.rundeck.org/rpm/rundeck-config-${PV}-1.20.GA.noarch.rpm"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+java_prepare() {
+ epatch "${FILESDIR}"/${P}-profile.patch
+}
+
+pkg_setup() {
+ enewgroup rundeck
+ enewuser rundeck -1 /bin/bash /var/lib/rundeck rundeck
+}
+
+src_install() {
+ insinto /etc
+ doins -r etc/rundeck
+ insinto /var/lib
+ doins -r var/lib/rundeck
+ dodir /var/log/rundeck
+ dodir /var/rundeck/projects
+ fowners -R rundeck:rundeck /var/lib/rundeck /var/log/rundeck
+ fowners -R rundeck:rundeck /var/rundeck
+
+ newinitd "${FILESDIR}"/rundeckd.initd rundeckd
+ echo . \"${EPREFIX}\"/etc/rundeck/profile > "${T}"/launcher-pre.sh
+
+ java-pkg_regjar "${ED}"/var/lib/rundeck/bootstrap/*.jar
+ java-pkg_dolauncher rundeckd \
+ -pre "${T}"/launcher-pre.sh \
+ --main com.dtolabs.rundeck.RunServer \
+ --java_args "\${RDECK_JVM}" \
+ --pkg_args "${EPREFIX}/var/lib/rundeck \${RDECK_HTTP_PORT}"
+}
diff --git a/app-misc/rundeck-cli-bin-0.1.11 b/app-misc/rundeck-cli-bin-0.1.11
deleted file mode 100644
index de88988ffb51..000000000000
--- a/app-misc/rundeck-cli-bin-0.1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Command line tool for rundeck
-EAPI=5
-HOMEPAGE=http://rundeck.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/rundeck/rundeck-cli/releases/download/v0.1.11/rundeck-cli-0.1.11-all.jar
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e13dae571ae9fb35efade21287cff6c
diff --git a/app-misc/rundeck-cli-bin-0.1.8 b/app-misc/rundeck-cli-bin-0.1.8
deleted file mode 100644
index b8eb6bc29518..000000000000
--- a/app-misc/rundeck-cli-bin-0.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Command line tool for rundeck
-EAPI=5
-HOMEPAGE=http://rundeck.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/rundeck/rundeck-cli/releases/download/v0.1.8/rundeck-cli-0.1.8-all.jar
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e13dae571ae9fb35efade21287cff6c
diff --git a/app-misc/rundeck-cli-bin/Manifest b/app-misc/rundeck-cli-bin/Manifest
new file mode 100644
index 000000000000..35c322e79264
--- /dev/null
+++ b/app-misc/rundeck-cli-bin/Manifest
@@ -0,0 +1,5 @@
+DIST rundeck-cli-0.1.11-all.jar 3447560 BLAKE2B e840d3b27dd173244781d1c37a6c3348d89896d3e81dd8fd36e7c3a33911228e46fff460d838d6c8d9bd79c254c9e469dd8b8e26bb645bd7334d38e04e257512 SHA512 3390d5b6ece391a9cf7754cc4c6d79a7720ac1db2f7a555d0b8216eea23feecc7e4cc947fb4c894362ece3bfaddcb383b7b10558d2e499e364e023c65636aa33
+DIST rundeck-cli-0.1.8-all.jar 3420534 BLAKE2B ea1ea74094fc0bbb84c0d8b052263d5e747a4407a8139124525b7d026d5ea3d9bf9c5db6dd2f0b00fd13a7d16f4c67133342da85f6872230a69fe44d6088eae1 SHA512 c7fff34c1a1091daf54e0ab89a832ab16e775704a6543af31745541419e3fc49d8b5fd47b404bda46dc1434945e652221825af553aff87b764623da4fe3bfdb6
+EBUILD rundeck-cli-bin-0.1.11.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
+EBUILD rundeck-cli-bin-0.1.8.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
+MISC metadata.xml 568 BLAKE2B 70e3ef9ffad4d6e5b64390db735dcb02835fd59dc7147b0a3c541ee7573a6a9a7dcc158aff4afc5702c7b052f3342aeb23683ceb3a284ae374390f2eca38d3be SHA512 3d650e73769e7ab68d5cd3e02f97325628172b8e36a99b3434029611f6c511122ff887f9a253095aa0a5a0ff0fba62128e23b0ef8c8863a3a8be6652073f617a
diff --git a/app-misc/rundeck-cli-bin/metadata.xml b/app-misc/rundeck-cli-bin/metadata.xml
new file mode 100644
index 000000000000..e5b6b571c957
--- /dev/null
+++ b/app-misc/rundeck-cli-bin/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Gentoo Java team</name>
+ </maintainer>
+ <longdescription lang="en">
+ This is a command line interface for
+ <pkg>app-misc/rundeck-cli-bin</pkg>.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">rundeck/rundeck-cli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
new file mode 100644
index 000000000000..d7bc4231484f
--- /dev/null
+++ b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="rundeck-cli"
+MY_P="rundeck-cli-${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Command line tool for rundeck"
+HOMEPAGE="http://rundeck.org"
+SRC_URI="https://github.com/rundeck/${MY_PN}/releases/download/v${PV}/${MY_P}-all.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_install() {
+ java-pkg_newjar "${DISTDIR}"/${MY_P}-all.jar ${MY_PN}.jar
+ java-pkg_dolauncher rd
+}
diff --git a/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild
new file mode 100644
index 000000000000..d7bc4231484f
--- /dev/null
+++ b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="rundeck-cli"
+MY_P="rundeck-cli-${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Command line tool for rundeck"
+HOMEPAGE="http://rundeck.org"
+SRC_URI="https://github.com/rundeck/${MY_PN}/releases/download/v${PV}/${MY_P}-all.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_install() {
+ java-pkg_newjar "${DISTDIR}"/${MY_P}-all.jar ${MY_PN}.jar
+ java-pkg_dolauncher rd
+}
diff --git a/app-misc/scope-0.04-r1 b/app-misc/scope-0.04-r1
deleted file mode 100644
index 9401847b23ed..000000000000
--- a/app-misc/scope-0.04-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Serial Line Analyser
-EAPI=4
-HOMEPAGE=http://www.gumbley.me.uk/scope.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.gumbley.me.uk/scope-0.04.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c5a97442962eff54298e278d2fcbe239
diff --git a/app-misc/scope/Manifest b/app-misc/scope/Manifest
new file mode 100644
index 000000000000..a790aae3203d
--- /dev/null
+++ b/app-misc/scope/Manifest
@@ -0,0 +1,3 @@
+DIST scope-0.04.tar.gz 69250 BLAKE2B 9c2f2455954e56188d6074d99c4636eca720863be04e35fe79a78741c5eea0d4421b1d1069f2e88337c024dde8ce8ba111551ee6901abd5b64b8da428efa4e26 SHA512 9067b7a870d6d409c2ee0406a7ba33e5a2bfb395de4ccf9b39b39f0ed49b9b4f7290844be7d375c7638e65715b4e1f4d80bfc6f333b9bbe1de5fe695eb164a03
+EBUILD scope-0.04-r1.ebuild 389 BLAKE2B 2f0c4035134a8f59a134d5009a82586e27025322360e4dc5da3db2b0ccfb474b887c471d08875871b0655a8f5d950e8cc8af078e4f61823c1e2fef7228e946ed SHA512 c97c0ad5647eec91e65a87ad44c5b8ac50d2347480bef317764666f69b1cf0ca29c7e7472e61f2b9b10641708ea4b61d87ea19cbbbac8c6748408ee0c0b3ad66
+MISC metadata.xml 422 BLAKE2B f9eae1346fd4dc916a5e81e8bd1cccf58abaae403efa660b4e9de637ebf1a2076f383ce1126e3b29460cb00e37409405e5341e79f0ab33c4981eaf4658306319 SHA512 e8d34f2cc9529a902c6840c2873161099c432e04dcdbf08566fd0012641057ddb47fd5d67d42b924744dcc0c9a81ca6ef9d0be6127d9e9fe46be8791a77f602f
diff --git a/app-misc/scope/metadata.xml b/app-misc/scope/metadata.xml
new file mode 100644
index 000000000000..6cc19a839b73
--- /dev/null
+++ b/app-misc/scope/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <longdescription lang="en">Serial Line Analyser</longdescription>
+</pkgmetadata>
diff --git a/app-misc/scope/scope-0.04-r1.ebuild b/app-misc/scope/scope-0.04-r1.ebuild
new file mode 100644
index 000000000000..b84a1c79ec4f
--- /dev/null
+++ b/app-misc/scope/scope-0.04-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Serial Line Analyser"
+HOMEPAGE="http://www.gumbley.me.uk/scope.html"
+SRC_URI="http://www.gumbley.me.uk/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DOCS=( README )
+
+src_prepare() {
+ # bug 459848
+ tc-export CC
+}
diff --git a/app-misc/screen-4.4.0 b/app-misc/screen-4.4.0
deleted file mode 100644
index 803c7ebbcf0d..000000000000
--- a/app-misc/screen-4.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=screen manager with VT100/ANSI terminal emulation
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/screen/
-IUSE=debug nethack pam selinux multiuser
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
-SLOT=0
-SRC_URI=mirror://gnu/screen/screen-4.4.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4dcc19834ecddb40cfbff74f17a87712
diff --git a/app-misc/screen-4.5.1 b/app-misc/screen-4.5.1
deleted file mode 100644
index 0154c01fd1ea..000000000000
--- a/app-misc/screen-4.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=screen manager with VT100/ANSI terminal emulation
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/screen/
-IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
-SLOT=0
-SRC_URI=mirror://gnu/screen/screen-4.5.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21826e05dd612c96660cc92012037763
diff --git a/app-misc/screen-4.6.0 b/app-misc/screen-4.6.0
deleted file mode 100644
index 27e3b2ab3911..000000000000
--- a/app-misc/screen-4.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=screen manager with VT100/ANSI terminal emulation
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/screen/
-IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
-SLOT=0
-SRC_URI=mirror://gnu/screen/screen-4.6.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b20e41eeb20509ef95731c6149c4e241
diff --git a/app-misc/screen-4.6.1 b/app-misc/screen-4.6.1
deleted file mode 100644
index a535c97acc30..000000000000
--- a/app-misc/screen-4.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=screen manager with VT100/ANSI terminal emulation
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/screen/
-IUSE=debug nethack pam selinux multiuser
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
-SLOT=0
-SRC_URI=mirror://gnu/screen/screen-4.6.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3405da52815f7dfd7c25a163d81d23f5
diff --git a/app-misc/screen-4.6.2 b/app-misc/screen-4.6.2
deleted file mode 100644
index a3daba36bfff..000000000000
--- a/app-misc/screen-4.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=screen manager with VT100/ANSI terminal emulation
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/screen/
-IUSE=debug nethack pam selinux multiuser
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
-SLOT=0
-SRC_URI=mirror://gnu/screen/screen-4.6.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1f2108c68ae47868e73170bcd55ea8b
diff --git a/app-misc/screen-9999 b/app-misc/screen-9999
deleted file mode 100644
index 0d63334ef1b9..000000000000
--- a/app-misc/screen-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=screen manager with VT100/ANSI terminal emulation
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/screen/
-IUSE=debug nethack pam selinux multiuser utmp
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) utmp? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) )
-RESTRICT=test
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77057cf1353386ad4006f72343d4a532
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
new file mode 100644
index 000000000000..c334d292394c
--- /dev/null
+++ b/app-misc/screen/Manifest
@@ -0,0 +1,17 @@
+AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
+AUX screen-4.4.0-utmp-musl.patch 1762 BLAKE2B 10244e1f2a13a3ffa9833ae16b9d58508bbc6cce62b1971b2b0f967e9642fe12fcf96b48cf79e20db186d92cf0b41c2870640f90f25a62d71e4e9fc7e3b390e3 SHA512 9720128e1c4849330b3e7ae8163beb0bf5b4c17e9c8d003a142db59d22dcce2bff0dd437afa209b3b1538c0f28f9d4521f54134d4e28104ee74ba73d57dc2314
+AUX screen-4.5.1-texinfo.patch 436 BLAKE2B bba167b64c504219a8ef893c4e2761b7fba607ce4801bf751ee900abf9be3884d2e6df753979762043faca03af2e590edd4d851b792b99c58fabe3a3836113bb SHA512 78b6e831414ef8cfc1f747f7eb9232ae907db4fa507967fb4b43b0266d045461f799ae37e71f8d93fed78e72bc0e7d90b93d131c9e24e47892468e96b880b0c4
+AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
+AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
+DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b
+DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f225d34394170572e79ab9a8b49beac6c054021db367a01b6da91deaa726284a25c86eb57e11dcd09ad5dc44cb4 SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
+DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
+DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
+DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
+EBUILD screen-4.4.0.ebuild 3980 BLAKE2B 3077899f647e40c745c435215768819a8bb11a21d3f91ac86c45bc107e96f8d8cbb9d86328f5b7bd8295f1d80afa73fa67405bf37c1b8319466ce57aaa33af42 SHA512 95379c53082d4bd334550dce454c087fc9591cf96a625018e1856eb7073ce267f5885a382b54fd46e73a319b64304ecb92f779b1aeb80898262b8daff763bc13
+EBUILD screen-4.5.1.ebuild 4127 BLAKE2B d224ced4b2a18f213fb6d2d8c31fb466d6a4fb19c4fe1a8f24823b40a58abee084d4f6f7e8870bba4c016b198182e88f61beb7b86a9ec8bcacabbc4dda5bf9f2 SHA512 6db1227a0d8f4580a1603b85bc0ff8cdfe868ba58c735848e0dd37b6b989406bfbc9c3a8803c11f185f5f78802633bbaf90284356c66d364ea566768be2a07fe
+EBUILD screen-4.6.0.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
+EBUILD screen-4.6.1.ebuild 4062 BLAKE2B 87465fca1c1a8568c704fb5ca3f67fc12ed41c187f05ac95bd7dc95233821f7dc00830df40eec87934e5df5ead4055c94f80d3388b067893e8c4044311e183a4 SHA512 16e09d9b1e90915c4962b8d1840659d0c2b456fb38acea38bd809ff4416008ee4c13e73efaac3d562a034db20525efc7325b7fd400e04b37bd57904ae2be0be4
+EBUILD screen-4.6.2.ebuild 4111 BLAKE2B cc6b4b3eeb615f3e313f6ed779aba160058e5d31c1b05342945bba687d3ea6f73d8f71f08fefb5d7d0e2130c6f4370b5f798e1b4529318defb67fc72172fdd67 SHA512 bf1ab9c61d9d1c8087c08315aa732fcd1922913b446bfa3729219d52f7628f9aa8fb7c1001743bd4a77eae4936117fc4f108b8aacbd29e33d4efaf4e8adf4ce1
+EBUILD screen-9999.ebuild 3746 BLAKE2B c8bbcdc221e6e4e310aa161e4faad0a517579a1ee9d639957356eeac1cda6f437b33b7780877d87a2f25881a52b76f9e4e71d8760c55a92b2ef790c2af12aeb7 SHA512 07fee252dc398dc18edd4aceebc3ca9d0a86e4523593bb58983ff401fcb7cfffbb969d60563ec8e657e944b14952d462e1d9dc61e274ffff869421673a90f1ed
+MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/files/screen-4.3.0-no-utempter.patch b/app-misc/screen/files/screen-4.3.0-no-utempter.patch
new file mode 100644
index 000000000000..e11be5b11e61
--- /dev/null
+++ b/app-misc/screen/files/screen-4.3.0-no-utempter.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -878,11 +878,6 @@
+ #include <utmp.h>
+ #endif
+ ],[struct utmp u; u.ut_host[0] = 0;], AC_DEFINE(UTHOST))
+-AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
+-if test "$have_utempter" = yes; then
+- AC_DEFINE(HAVE_UTEMPTER)
+- LIBS="$LIBS -lutempter"
+-fi
+
+ dnl
+ dnl **** loadav ****
diff --git a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
new file mode 100644
index 000000000000..990c73042cd0
--- /dev/null
+++ b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
@@ -0,0 +1,62 @@
+From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Sat, 13 Jun 2015 17:52:46 +0200
+Subject: [PATCH] change checks for utmp/utmpx in header
+
+linuxes should've working utmpx, so this check was bit weird
+commit 2b1bdf96 mentions some "linux workaround", but nothing specific
+
+fixes build with musl libc
+---
+ os.h | 7 ++++---
+ utmp.c | 4 ++--
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/os.h b/os.h
+index 55de249..e827ac9 100644
+--- a/os.h
++++ b/os.h
+@@ -250,9 +250,11 @@ extern int errno;
+ #endif
+
+ #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
+-# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
++# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
+ # include <utmpx.h>
+-# define UTMPFILE UTMPX_FILE
++# ifdef UTMPX_FILE /* GNU extension */
++# define UTMPFILE UTMPX_FILE
++# endif
+ # define utmp utmpx
+ # define getutent getutxent
+ # define getutid getutxid
+@@ -260,7 +262,6 @@ extern int errno;
+ # define pututline pututxline
+ # define setutent setutxent
+ # define endutent endutxent
+-# define ut_time ut_xtime
+ # else /* SVR4 */
+ # include <utmp.h>
+ # endif /* SVR4 */
+diff --git a/utmp.c b/utmp.c
+index fa8b87b..f5d7db8 100644
+--- a/utmp.c
++++ b/utmp.c
+@@ -631,7 +631,7 @@ int pid;
+ /* must use temp variable because of NetBSD/sparc64, where
+ * ut_xtime is long(64) but time_t is int(32) */
+ (void)time(&now);
+- u->ut_time = now;
++ u->ut_tv.tv_sec = now;
+ }
+
+ static slot_t
+@@ -743,7 +743,7 @@ int pid;
+ strncpy(u->ut_line, line, sizeof(u->ut_line));
+ strncpy(u->ut_name, user, sizeof(u->ut_name));
+ (void)time(&now);
+- u->ut_time = now;
++ u->ut_tv.tv_sec = now;
+ }
+
+ static slot_t
diff --git a/app-misc/screen/files/screen-4.5.1-texinfo.patch b/app-misc/screen/files/screen-4.5.1-texinfo.patch
new file mode 100644
index 000000000000..8d7a5e527175
--- /dev/null
+++ b/app-misc/screen/files/screen-4.5.1-texinfo.patch
@@ -0,0 +1,13 @@
+--- a/doc/screen.texinfo
++++ b/doc/screen.texinfo
+@@ -5796,8 +5796,8 @@
+ ============
+
+ @example
+- Thomas Renninger <treen@suse.com>,
+- Axel Beckert <abe@deuxchevaux.org>,
++ Thomas Renninger <treen@@suse.com>,
++ Axel Beckert <abe@@deuxchevaux.org>,
+ Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
+ Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
+ Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
diff --git a/app-misc/screen/files/screen-4.6.2-utmp-exit.patch b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch
new file mode 100644
index 000000000000..11adf69a5368
--- /dev/null
+++ b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch
@@ -0,0 +1,55 @@
+From 2f1b9dfe03133c9b77ea450aed088d65128dc547 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Tue, 5 Apr 2016 12:47:08 +0200
+Subject: [PATCH] check if we have ut_exit in utmpx struct
+
+---
+ acconfig.h | 5 +++++
+ configure.ac | 4 ++++
+ utmp.c | 2 ++
+ 3 files changed, 11 insertions(+)
+
+diff --git a/acconfig.h b/acconfig.h
+index 656e117..d173c9c 100644
+--- a/acconfig.h
++++ b/acconfig.h
+@@ -215,6 +215,11 @@
+ #undef HAVE_UTEMPTER
+
+ /*
++ * Define if your utmpx has ut_exit struct
++ */
++#undef HAVE_UT_EXIT
++
++/*
+ * If your system has the calls setreuid() and setregid(),
+ * define HAVE_SETREUID. Otherwise screen will use a forked process to
+ * safely create output files without retaining any special privileges.
+diff --git a/configure.ac b/configure.ac
+index 1a75020..8457619 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -374,6 +374,10 @@ if test "$have_utempter" = yes; then
+ AC_DEFINE(HAVE_UTEMPTER)
+ LIBS="$LIBS -lutempter"
+ fi
++AC_CHECKING(ut_exit)
++AC_TRY_COMPILE([
++#include <utmpx.h>
++],[struct utmpx u; u.ut_exit.e_exit;], AC_DEFINE(HAVE_UT_EXIT))
+
+ dnl
+ dnl **** signal handling ****
+diff --git a/utmp.c b/utmp.c
+index da8d7ff..c864d07 100644
+--- a/utmp.c
++++ b/utmp.c
+@@ -381,7 +381,7 @@ static int pututslot(slot_t slot, struct utmpx *u, char *host, Window *win)
+ struct utmp *u;
+ {
+ u->ut_type = DEAD_PROCESS;
+-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__)
++#if defined(HAVE_UT_EXIT)
+ u->ut_exit.e_termination = 0;
+ u->ut_exit.e_exit = 0;
+ #endif
diff --git a/app-misc/screen/files/screenrc b/app-misc/screen/files/screenrc
new file mode 100644
index 000000000000..11f2f551b0bc
--- /dev/null
+++ b/app-misc/screen/files/screenrc
@@ -0,0 +1,356 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# /etc/screenrc
+#
+# This is the system wide screenrc.
+#
+# You can use this file to change the default behavior of screen system wide
+# or copy it to ~/.screenrc and use it as a starting point for your own
+# settings.
+#
+# Commands in this file are used to set options, bind screen functions to
+# keys, redefine terminal capabilities, and to automatically establish one or
+# more windows at the beginning of your screen session.
+#
+# This is not a comprehensive list of options, look at the screen manual for
+# details on everything that you can put in this file.
+#
+#
+
+# ==============================================================================
+# SCREEN SETTINGS
+# ==============================================================================
+
+# ESCAPE - the COMMAND CHARACTER
+# ===============================================================
+# escape ^aa # default
+# escape ^^^^ # suggested binding (Control-^) for Emacs users
+
+
+# PASSWORD
+# ===============================================================
+# This commands sets the *internal* password for the screen session.
+# WARNING!! If this is set then a "lock" command will only let you in to the
+# session after you enter the user's account password and then *also*
+# the internal password for that session. This gives additional safety but,
+# if you forget the internal password then you cannot resume your session.
+# Use :password to generate a password
+# password ODSJQf.4IJN7E # "1234"
+
+
+# VARIABLES
+# ===============================================================
+# No annoying audible bell, using "visual bell"
+# vbell on # default: off
+# vbell_msg " -- Bell,Bell!! -- " # default: "Wuff,Wuff!!"
+
+# Automatically detach on hangup.
+ autodetach on # default: on
+
+# Don't display the copyright page
+ startup_message off # default: on
+
+# Uses nethack-style messages
+# nethack on # default: off
+
+# Affects the copying of text regions
+ crlf off # default: off
+
+# Enable/disable multiuser mode. Standard screen operation is singleuser.
+# In multiuser mode the commands acladd, aclchg, aclgrp and acldel can be used
+# to enable (and disable) other user accessing this screen session.
+# Requires suid-root.
+ multiuser off
+
+# Change default scrollback value for new windows
+ defscrollback 1000 # default: 100
+
+# Define the time that all windows monitored for silence should
+# wait before displaying a message. Default 30 seconds.
+ silencewait 15 # default: 30
+
+# bufferfile: The file to use for commands
+# "readbuf" ('<') and "writebuf" ('>'):
+ bufferfile $HOME/.screen_exchange
+#
+# hardcopydir: The directory which contains all hardcopies.
+# hardcopydir ~/.hardcopy
+# hardcopydir ~/.screen
+#
+# shell: Default process started in screen's windows.
+# Makes it possible to use a different shell inside screen
+# than is set as the default login shell.
+# If begins with a '-' character, the shell will be started as a login shell.
+# shell zsh
+# shell bash
+# shell ksh
+ shell -$SHELL
+
+# shellaka '> |tcsh'
+# shelltitle '$ |bash'
+
+# emulate .logout message
+ pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended."
+
+# caption always " %w --- %c:%s"
+# caption always "%3n %t%? @%u%?%? [%h]%?%=%c"
+
+# advertise hardstatus support to $TERMCAP
+# termcapinfo * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\'
+
+# set every new windows hardstatus line to somenthing descriptive
+# defhstatus "screen: ^En (^Et)"
+
+# don't kill window after the process died
+# zombie "^["
+
+# ignore displays that block on output
+defnonblock on
+
+# XTERM TWEAKS
+# ===============================================================
+
+# xterm understands both im/ic and doesn't have a status line.
+# Note: Do not specify im and ic in the real termcap/info file as
+# some programs (e.g. vi) will not work anymore.
+ termcap xterm* hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
+ terminfo xterm* hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
+
+# 80/132 column switching must be enabled for ^AW to work
+# change init sequence to not switch width
+ termcapinfo xterm* Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
+
+# Make the output buffer large for (fast) xterms.
+# termcapinfo xterm* OL=10000
+ termcapinfo xterm* OL=100
+
+# tell screen that xterm can switch to dark background and has function
+# keys.
+ termcapinfo xterm* 'VR=\E[?5h:VN=\E[?5l'
+ termcapinfo xterm* 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
+ termcapinfo xterm* 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
+
+# special xterm hardstatus: use the window title.
+ termcapinfo xterm* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
+
+#terminfo xterm 'vb=\E[?5h$<200/>\E[?5l'
+ termcapinfo xterm* 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
+
+# emulate part of the 'K' charset
+ termcapinfo xterm* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
+
+# xterm-52 tweaks:
+# - uses background color for delete operations
+ termcapinfo xterm* be
+
+# Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195)
+ termcapinfo xterm*|xs ti@:te=\E[2J
+
+# WYSE TERMINALS
+# ===============================================================
+
+#wyse-75-42 must have flow control (xo = "terminal uses xon/xoff")
+#essential to have it here, as this is a slow terminal.
+ termcapinfo wy75-42 xo:hs@
+
+# New termcap sequences for cursor application mode.
+ termcapinfo wy* CS=\E[?1h:CE=\E[?1l:vi=\E[?25l:ve=\E[?25h:VR=\E[?5h:VN=\E[?5l:cb=\E[1K:CD=\E[1J
+
+
+# OTHER TERMINALS
+# ===============================================================
+
+# make hp700 termcap/info better
+ termcapinfo hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
+
+# Extend the vt100 desciption by some sequences.
+ termcap vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC
+ terminfo vt100* ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC
+ termcapinfo linux C8
+# old rxvt versions also need this
+# termcapinfo rxvt C8
+
+
+# KEYBINDINGS
+# ==============================================================
+# The "bind" command assign keys to (internal) commands
+# SCREEN checks all the keys you type; you type the key
+# which is known as the "command character" then SCREEN
+# eats this key, too, and checks whether this key is
+# "bound" to a command. If so then SCREEN will execute it.
+#
+# The command "bind" allows you to chose which keys
+# will be assigned to the commands.
+#
+# Some commands are bound to several keys -
+# usually to both some letter and its corresponding
+# control key combination, eg the command
+# "(create) screen" is bound to both 'c' and '^C'.
+#
+# The following list shows the default bindings:
+#
+# break ^B b
+# clear C
+# colon :
+# copy ^[ [
+# detach ^D d
+# digraph ^V
+# displays *
+# dumptermcap .
+# fit F
+# flow ^F f
+# focus ^I
+# hardcopy h
+# help ?
+# history { }
+# info i
+# kill K k
+# lastmsg ^M m
+# license ,
+# log H
+# login L
+# meta x
+# monitor M
+# next ^@ ^N sp n
+# number N
+# only Q
+# other ^X
+# pow_break B
+# pow_detach D
+# prev ^H ^P p ^?
+# quit \
+# readbuf <
+# redisplay ^L l
+# remove X
+# removebuf =
+# reset Z
+# screen ^C c
+# select " '
+# silence _
+# split S
+# suspend ^Z z
+# time ^T t
+# title A
+# vbell ^G
+# version v
+# width W
+# windows ^W w
+# wrap ^R r
+# writebuf >
+# xoff ^S s
+# xon ^Q q
+# ^] paste .
+# - select -
+# 0 select 0
+# 1 select 1
+# 2 select 2
+# 3 select 3
+# 4 select 4
+# 5 select 5
+# 6 select 6
+# 7 select 7
+# 8 select 8
+# 9 select 9
+# I login on
+# O login off
+# ] paste .
+#
+
+# And here are the default bind commands if you need them:
+#
+# bind A title
+# bind C clear
+# bind D pow_detach
+# bind F fit
+# bind H log
+# bind I login on
+# bind K kill
+# bind L login
+# bind M monitor
+# bind N number
+# bind O login off
+# bind Q only
+# bind S split
+# bind W width
+# bind X remove
+# bind Z reset
+
+# Let's remove some dangerous key bindings ...
+ bind k
+ bind ^k
+# bind . dumptermcap # default
+ bind .
+# bind ^\ quit # default
+ bind ^\
+# bind \\ quit # default
+ bind \\
+# bind ^h ??? # default
+ bind ^h
+# bind h hardcopy # default
+ bind h
+
+# ... and make them better.
+ bind 'K' kill
+ bind 'I' login on
+ bind 'O' login off
+ bind '}' history
+
+# Yet another hack:
+# Prepend/append register [/] to the paste if ^a^] is pressed.
+# This lets me have autoindent mode in vi.
+ register [ "\033:se noai\015a"
+ register ] "\033:se ai\015a"
+ bind ^] paste [.]
+
+
+# hardstatus alwaysignore
+# hardstatus alwayslastline "%Lw"
+
+# Resize the current region. The space will be removed from or added to
+# the region below or if there's not enough space from the region above.
+ bind = resize =
+ bind + resize +3
+ bind - resize -3
+# bind _ resize max
+#
+# attrcolor u "-u b"
+# attrcolor b "R"
+
+# STARTUP SCREENS
+# ===============================================================
+# Defines the time screen delays a new message when one message
+# is currently displayed. The default is 1 second.
+# msgminwait 2
+
+# Time a message is displayed if screen is not disturbed by
+# other activity. The dafault is 5 seconds:
+# msgwait 2
+
+# Briefly show the version number of this starting
+# screen session - but only for *one* second:
+# msgwait 1
+# version
+
+# Welcome the user:
+# echo "welcome :-)"
+# echo "I love you today."
+
+# Uncomment one/some following lines to automatically let
+# SCREEN start some programs in the given window numbers:
+# screen -t MAIL 0 mutt
+# screen -t EDIT 1 vim
+# screen -t GOOGLE 2 links http://www.google.com
+# screen -t NEWS 3 slrn
+# screen -t WWW 4 links http://www.math.fu-berlin.de/~guckes/
+# screen 5
+# screen 6
+
+# Set the environment variable var to value string. If only var is specified,
+# you'll be prompted to enter a value. If no parameters are specified,
+# you'll be prompted for both variable and value. The environment is
+# inherited by all subsequently forked shells.
+# setenv PROMPT_COMMAND 'echo -n -e "\033k\033\134"'
+
+# Don't you want to start programs which need a DISPLAY ?
+# setenv DISPLAY ''
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
new file mode 100644
index 000000000000..85dc556e636e
--- /dev/null
+++ b/app-misc/screen/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>swegener@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription>
+Screen is a full-screen window manager that multiplexes a physical terminal
+between several processes, typically interactive shells. Each virtual terminal
+provides the functions of the DEC VT100 terminal and, in addition, several
+control functions from the ANSI X3.64 (ISO 6429) and ISO 2022 standards (e.g.,
+insert/delete line and support for multiple character sets). There is a
+scrollback history buffer for each virtual terminal and a copy-and-paste
+mechanism that allows the user to move text regions between windows. When screen
+is called, it creates a single window with a shell in it (or the specified
+command) and then gets out of your way so that you can use the program as you
+normally would. Then, at any time, you can create new (full-screen) windows with
+other programs in them (including more shells), kill the current window, view a
+list of the active windows, turn output logging on and off, copy text between
+windows, view the scrollback history, switch between windows, etc. All windows
+run their programs completely independent of each other. Programs continue to
+run when their window is currently not visible and even when the whole screen
+session is detached from the users terminal.
+</longdescription>
+ <use>
+ <flag name="multiuser">Enable multiuser support (by setting correct
+ permissions)</flag>
+ <flag name="nethack">Express error messages in nethack style</flag>
+ <flag name="utmp">Include utmp support</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
new file mode 100644
index 000000000000..af3dde775a65
--- /dev/null
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic pam toolchain-funcs user
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+# Patches:
+# - Don't use utempter even if it is found on the system.
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ "${FILESDIR}"/${P}-utmp-musl.patch
+)
+
+pkg_setup() {
+ # Make sure utmp group exists, as it's used later on.
+ enewgroup utmp 406
+}
+
+src_prepare() {
+ # Apply patches.
+ epatch "${PATCHES[@]}"
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 \
+ || die
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ econf \
+ --with-socket-dir="${EPREFIX}/tmp/screen" \
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+ --with-pty-mode=0620 \
+ --with-pty-group=5 \
+ --enable-rxvt_osc \
+ --enable-telnet \
+ --enable-colors256 \
+ $(use_enable pam)
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local tmpfiles_perms tmpfiles_group
+
+ dobin screen
+
+ if use multiuser || use prefix
+ then
+ fperms 4755 /usr/bin/screen
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/screen
+ fperms 2755 /usr/bin/screen
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ dodir /etc/tmpfiles.d
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ > "${ED}"/etc/tmpfiles.d/screen.conf
+
+ insinto /usr/share/screen
+ doins terminfo/{screencap,screeninfo.src}
+ insinto /usr/share/screen/utf8encodings
+ doins utf8encodings/??
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ pamd_mimic_system screen auth
+
+ dodoc \
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+ doman doc/screen.1
+ doinfo doc/screen.info
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild
new file mode 100644
index 000000000000..3ed9e6bf384c
--- /dev/null
+++ b/app-misc/screen/screen-4.5.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" = 9999 ]] && SCM="git-r3"
+inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
+unset SCM
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+ S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ # @ => @@
+ "${FILESDIR}"/${PN}-4.5.1-texinfo.patch
+)
+
+pkg_setup() {
+ # Make sure utmp group exists, as it's used later on.
+ enewgroup utmp 406
+}
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 \
+ || die
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ econf \
+ --with-socket-dir="${EPREFIX}/tmp/screen" \
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+ --with-pty-mode=0620 \
+ --with-pty-group=5 \
+ --enable-rxvt_osc \
+ --enable-telnet \
+ --enable-colors256 \
+ $(use_enable pam)
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local DOCS=(
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+ )
+
+ default
+
+ local tmpfiles_perms tmpfiles_group
+
+ if use multiuser || use prefix
+ then
+ fperms 4755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/screen-${PV}
+ fperms 2755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ dodir /etc/tmpfiles.d
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ > "${ED}"/etc/tmpfiles.d/screen.conf
+
+ insinto /usr/share/screen
+ doins terminfo/{screencap,screeninfo.src}
+
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ pamd_mimic_system screen auth
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild
new file mode 100644
index 000000000000..11e428ca57cc
--- /dev/null
+++ b/app-misc/screen/screen-4.6.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" = 9999 ]] && SCM="git-r3"
+inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
+unset SCM
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+ S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+)
+
+pkg_setup() {
+ # Make sure utmp group exists, as it's used later on.
+ enewgroup utmp 406
+}
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 \
+ || die
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ econf \
+ --with-socket-dir="${EPREFIX}/tmp/screen" \
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+ --with-pty-mode=0620 \
+ --with-pty-group=5 \
+ --enable-rxvt_osc \
+ --enable-telnet \
+ --enable-colors256 \
+ $(use_enable pam)
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local DOCS=(
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+ )
+
+ default
+
+ local tmpfiles_perms tmpfiles_group
+
+ if use multiuser || use prefix
+ then
+ fperms 4755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/screen-${PV}
+ fperms 2755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ dodir /etc/tmpfiles.d
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ > "${ED}"/etc/tmpfiles.d/screen.conf
+
+ insinto /usr/share/screen
+ doins terminfo/{screencap,screeninfo.src}
+
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ pamd_mimic_system screen auth
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
new file mode 100644
index 000000000000..5ad1bf9cd4ee
--- /dev/null
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" = 9999 ]] && SCM="git-r3"
+inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
+unset SCM
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+ S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+)
+
+pkg_setup() {
+ # Make sure utmp group exists, as it's used later on.
+ enewgroup utmp 406
+}
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 \
+ || die
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ econf \
+ --with-socket-dir="${EPREFIX}/tmp/screen" \
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+ --with-pty-mode=0620 \
+ --with-pty-group=5 \
+ --enable-rxvt_osc \
+ --enable-telnet \
+ --enable-colors256 \
+ $(use_enable pam)
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local DOCS=(
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+ )
+
+ default
+
+ local tmpfiles_perms tmpfiles_group
+
+ if use multiuser || use prefix
+ then
+ fperms 4755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/screen-${PV}
+ fperms 2755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ dodir /etc/tmpfiles.d
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ > "${ED}"/etc/tmpfiles.d/screen.conf
+
+ insinto /usr/share/screen
+ doins terminfo/{screencap,screeninfo.src}
+
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ pamd_mimic_system screen auth
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
new file mode 100644
index 000000000000..344c79d869d4
--- /dev/null
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" = 9999 ]] && SCM="git-r3"
+inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
+unset SCM
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+ S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ "${FILESDIR}"/${P}-utmp-exit.patch
+)
+
+pkg_setup() {
+ # Make sure utmp group exists, as it's used later on.
+ enewgroup utmp 406
+}
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 \
+ || die
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ econf \
+ --with-socket-dir="${EPREFIX}/tmp/screen" \
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+ --with-pty-mode=0620 \
+ --with-pty-group=5 \
+ --enable-rxvt_osc \
+ --enable-telnet \
+ --enable-colors256 \
+ $(use_enable pam)
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local DOCS=(
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+ )
+
+ default
+
+ local tmpfiles_perms tmpfiles_group
+
+ if use multiuser || use prefix
+ then
+ fperms 4755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/screen-${PV}
+ fperms 2755 /usr/bin/screen-${PV}
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ dodir /etc/tmpfiles.d
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ > "${ED}"/etc/tmpfiles.d/screen.conf
+
+ insinto /usr/share/screen
+ doins terminfo/{screencap,screeninfo.src}
+
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ pamd_mimic_system screen auth
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
new file mode 100644
index 000000000000..c7c5f5638521
--- /dev/null
+++ b/app-misc/screen/screen-9999.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug nethack pam selinux multiuser utmp"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )
+ utmp? (
+ kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+RESTRICT="test"
+S="${WORKDIR}"/${P}/src
+
+pkg_setup() {
+ # Make sure utmp group exists, as it's used later on.
+ enewgroup utmp 406
+}
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i \
+ -e '/include/ s:sched.h:_sched.h:' \
+ screen.h winmsg.c canvas.h sched.c || die
+ sed -i -e 's:sched.h:_sched.h:g' Makefile.in || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e 's:/local/screens/S\\-:'"${EPREFIX}"'/tmp/screen/S\\-:g' \
+ -e 's:/usr/tmp/screens/:'"${EPREFIX}"'/tmp/screen/:g' \
+ doc/screen.1 \
+ || die
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ econf \
+ --enable-socket-dir="${EPREFIX}/tmp/screen" \
+ --with-system_screenrc="${EPREFIX}/etc/screenrc" \
+ --with-pty-mode=0620 \
+ --with-pty-group=5 \
+ --enable-telnet \
+ $(use_enable pam) \
+ $(use_enable utmp)
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local tmpfiles_perms tmpfiles_group
+
+ dobin screen
+
+ if use multiuser || use prefix
+ then
+ fperms 4755 /usr/bin/screen
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/screen
+ fperms 2755 /usr/bin/screen
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ dodir /etc/tmpfiles.d
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ >"${ED}"/etc/tmpfiles.d/screen.conf
+
+ insinto /usr/share/screen
+ doins terminfo/{screencap,screeninfo.src}
+ insinto /usr/share/screen/utf8encodings
+ doins utf8encodings/??
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ pamd_mimic_system screen auth
+
+ dodoc \
+ README ChangeLog INSTALL TODO NEWS* \
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+ doman doc/screen.1
+ doinfo doc/screen.info
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to /run/screen."
+}
diff --git a/app-misc/screenfetch-3.8.0 b/app-misc/screenfetch-3.8.0
deleted file mode 100644
index 963154eaa9b4..000000000000
--- a/app-misc/screenfetch-3.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Bash Screenshot Information Tool
-EAPI=6
-HOMEPAGE=https://github.com/KittyKatt/screenFetch
-IUSE=curl X
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
-SLOT=0
-SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.8.0.tar.gz -> screenfetch-3.8.0.tar.gz
-_md5_=485f50a37043d0f131d3dea853e2794a
diff --git a/app-misc/screenfetch-9999 b/app-misc/screenfetch-9999
deleted file mode 100644
index 682262e5692f..000000000000
--- a/app-misc/screenfetch-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Bash Screenshot Information Tool
-EAPI=6
-HOMEPAGE=https://github.com/KittyKatt/screenFetch
-IUSE=curl X
-LICENSE=GPL-3
-RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=4577b37575227d8df78d40a8e3a7530d
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
new file mode 100644
index 000000000000..d5318c297931
--- /dev/null
+++ b/app-misc/screenfetch/Manifest
@@ -0,0 +1,4 @@
+DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
+EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
+EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
+MISC metadata.xml 565 BLAKE2B 765d7d26e0e26fa7fc38808d02d8c9f49af990cacb9c22e670a53dd968dea368411beee7c3c4f9df2b877c8337944bf513edfd086f147dff54e6ac50e77df1a4 SHA512 a6032e340f2ebc2eb69673cdf61fd9c6da9a141e59aea3ff60bdb47120b86147ed6b971cc16df936a7391f8ab8fe8258e10444ffe11e79a7118620f883de45fa
diff --git a/app-misc/screenfetch/metadata.xml b/app-misc/screenfetch/metadata.xml
new file mode 100644
index 000000000000..a91c788aff05
--- /dev/null
+++ b/app-misc/screenfetch/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
+ </maintainer>
+ <use>
+ <flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">KittyKatt/screenFetch</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
new file mode 100644
index 000000000000..35f27763226d
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="curl X"
+
+DEPEND=""
+RDEPEND="
+ curl? ( net-misc/curl )
+ X? (
+ media-gfx/scrot
+ x11-apps/xdpyinfo
+ )"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
+ inherit git-r3
+else
+ KEYWORDS="amd64 x86 ~x64-macos"
+ SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+src_install() {
+ newbin ${PN}-dev ${PN}
+ einstalldocs
+}
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
new file mode 100644
index 000000000000..0c17327b86ac
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="curl X"
+
+DEPEND=""
+RDEPEND="
+ curl? ( net-misc/curl )
+ X? (
+ media-gfx/scrot
+ x11-apps/xdpyinfo
+ )"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86 ~x64-macos"
+ SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+src_install() {
+ newbin ${PN}-dev ${PN}
+ einstalldocs
+}
diff --git a/app-misc/screenie-1.30.0-r1 b/app-misc/screenie-1.30.0-r1
deleted file mode 100644
index ac92bac450a1..000000000000
--- a/app-misc/screenie-1.30.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=screen(1) frontend that is designed to be a session handler
-EAPI=6
-HOMEPAGE=http://pubwww.hsz-t.ch/~mgloor/screenie.html
-KEYWORDS=amd64 ~arm hppa ia64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=app-misc/screen
-SLOT=0
-SRC_URI=http://pubwww.hsz-t.ch/~mgloor/data/screenie-1.30.0.tar.bz2
-_md5_=8314b947eee18fa75fd6f8c19d40b7ab
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
new file mode 100644
index 000000000000..c6340fea67ae
--- /dev/null
+++ b/app-misc/screenie/Manifest
@@ -0,0 +1,4 @@
+AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
+DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
+EBUILD screenie-1.30.0-r1.ebuild 537 BLAKE2B 59e03a7925ea5ae22b3bfa3c4f8c915a804137a35b75e5e5c8fbb621c13856805bdc9383670a602e609d5ae5d5f9f8dbe5ba874eaa5cc8dc0535fc4b0f3a10dd SHA512 6cb6a54c1dde75c1d1fb186e4f9f052ae8b0a0d692304005758bfe7197c2b03432692091e75d1fc42a4468700fef1bd7935322ccf10b0ff41978c067f5fe41c0
+MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
diff --git a/app-misc/screenie/files/screenie-CVE-2008-5371.patch b/app-misc/screenie/files/screenie-CVE-2008-5371.patch
new file mode 100644
index 000000000000..2bf8dbdc6b8a
--- /dev/null
+++ b/app-misc/screenie/files/screenie-CVE-2008-5371.patch
@@ -0,0 +1,26 @@
+Patch for bug 250476 (CVE-2008-5371), courtesy of nion@debian.org.
+
+diff -u screenie-1.30.0/screenie screenie-1.30.0/screenie
+--- screenie-1.30.0/screenie
++++ screenie-1.30.0/screenie
+@@ -19,7 +19,7 @@
+ # Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+ #global settings
+-TMPF=/tmp/.screenie.$$
++TMPF=$(mktemp -t skreenie.XXXXXX || exit 1)
+ ACTIVE_SCREENS="screen \-ls | awk '/tached/ { print \$1}' | sort"
+ i=0
+ e=0
+@@ -59,9 +59,9 @@
+ esac
+
+ #cleanup temp files
+-if test -f /tmp/.screenie*
++if test -f $TMPF
+ then
+- rm /tmp/.screenie* >/dev/null 2>&1
++ rm $TMPF >/dev/null 2>&1
+ fi
+
+ while :
diff --git a/app-misc/screenie/metadata.xml b/app-misc/screenie/metadata.xml
new file mode 100644
index 000000000000..3fcb159a037e
--- /dev/null
+++ b/app-misc/screenie/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>rgkmg25@gmail.com</email>
+ <name>Robert Kowalski</name>
+ </maintainer>
+ <longdescription lang="en">
+ Screenie is a small and lightweight GNU screen(1) frontend that is
+ designed to be a session handler that simplifies the process of
+ administrating detached jobs by providing an interactive menu.
+ </longdescription>
+ <longdescription lang="ja">
+ Screenie「スクリーãƒã€ã¨è¨€ã†ã‚¢ãƒƒãƒ—ã¯å°ã•ã„ãªGNU
+ Screen(1)フロントエンドã§ã™ã€‚対話的メニューã§
+ プロセス管ç†ã‚’安ããªã‚Šã¾ã™ã€‚
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
new file mode 100644
index 000000000000..24d0adb2af8f
--- /dev/null
+++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="screen(1) frontend that is designed to be a session handler"
+HOMEPAGE="http://pubwww.hsz-t.ch/~mgloor/screenie.html"
+SRC_URI="http://pubwww.hsz-t.ch/~mgloor/data/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ia64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-misc/screen"
+
+PATCHES=( "${FILESDIR}/${PN}-CVE-2008-5371.patch" )
+
+src_install() {
+ dobin screenie || die "dobin failed"
+ default
+}
diff --git a/app-misc/scrub-2.5.2 b/app-misc/scrub-2.5.2
deleted file mode 100644
index b737333dda19..000000000000
--- a/app-misc/scrub-2.5.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=write patterns on disk/file
-EAPI=6
-HOMEPAGE=https://github.com/chaos/scrub
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/chaos/scrub/archive/2.5.2.tar.gz -> scrub-2.5.2.tar.gz
-_md5_=f28dc03e2342690fe7dba9a34a52df59
diff --git a/app-misc/scrub-2.6.1 b/app-misc/scrub-2.6.1
deleted file mode 100644
index ac0c82b86a74..000000000000
--- a/app-misc/scrub-2.6.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Overwrite files with iterative patterns.
-EAPI=6
-HOMEPAGE=https://github.com/chaos/scrub
-KEYWORDS=amd64 ~arm64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/chaos/scrub/releases/download/2.6.1/scrub-2.6.1.tar.gz
-_md5_=81f02ade1b54bb2a5296b1345aeee7b8
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
new file mode 100644
index 000000000000..7aa3c4abdbd5
--- /dev/null
+++ b/app-misc/scrub/Manifest
@@ -0,0 +1,5 @@
+DIST scrub-2.5.2.tar.gz 192060 BLAKE2B 4709bf04e2aa8ef01b835c8fd30c31f2990f902fc2704454bd2b8871518a3d525d9101abd9f2ebb11171cb57937b598125b599371908c3b32800dfbd7aeda0fb SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201
+DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
+EBUILD scrub-2.5.2.ebuild 361 BLAKE2B 12c02e0203f651d963a8e03820e0c32124870f4501ffb0236652941a7a455342165107e852a84f2435e8a4732c57567ba840414292d385c8492398ff2bf08dcb SHA512 f03300f1f891d99128652209b056a90af2c5ca70dc693afd75c3846dccd476f5f129ce2ba92596f60ff6f2400182edbac31299a5109bd178c56ac748c22d4360
+EBUILD scrub-2.6.1.ebuild 384 BLAKE2B 2a0fc84c1694aeef2af97aa6d9d1d6ec5c41a3560df32ec41b6f45833f2623b7c751082afdae18fa90dd0af7408afff6b546b51eb1e744959de14e6f3920623a SHA512 1bfec404206dcfaf9667e840046efe9abd873b7a86842e3217af7209c4e2ff3bb313ef39740dace3367313951e9654fbbf4e5fdfd2dc1106165d4ec1ff9b66e2
+MISC metadata.xml 510 BLAKE2B 9817d83c7d276ad65540f04164def946802c84cd2e9c4032850f9a56fa9ac696653ad710329b6e366f50728ec85a5d75df20e46e1390f7a5a2473473f01d6c01 SHA512 765ffd0e734190ea3df782ae4842ed23a78857747b459865e41f017f995e7f364d2d04fab119d1d1f24d6a4fb7688a07e65e1c324189fef968f83a38ef2156ce
diff --git a/app-misc/scrub/metadata.xml b/app-misc/scrub/metadata.xml
new file mode 100644
index 000000000000..860304ffaf2e
--- /dev/null
+++ b/app-misc/scrub/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <longdescription>Scrub overwrites hard disks, files, and other devices with repeating patterns intended to make recovering data from these devices more difficult.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">chaos/scrub</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/scrub/scrub-2.5.2.ebuild b/app-misc/scrub/scrub-2.5.2.ebuild
new file mode 100644
index 000000000000..ede2f37a6bc0
--- /dev/null
+++ b/app-misc/scrub/scrub-2.5.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="write patterns on disk/file"
+HOMEPAGE="https://github.com/chaos/scrub"
+SRC_URI="https://github.com/chaos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
new file mode 100644
index 000000000000..654963361fc9
--- /dev/null
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Overwrite files with iterative patterns."
+HOMEPAGE="https://github.com/chaos/scrub"
+SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/app-misc/selecta-0.0.7 b/app-misc/selecta-0.0.7
deleted file mode 100644
index 87af1c9731ec..000000000000
--- a/app-misc/selecta-0.0.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A fuzzy text selector for files and anything else you need to select
-EAPI=6
-HOMEPAGE=https://github.com/garybernhardt/selecta
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ruby-1.9.3
-SLOT=0
-SRC_URI=https://github.com/garybernhardt/selecta/archive/v0.0.7.tar.gz -> selecta-0.0.7.tar.gz
-_md5_=3121a5fe9c5109e92972ce831556cfef
diff --git a/app-misc/selecta-9999 b/app-misc/selecta-9999
deleted file mode 100644
index f35a335cc900..000000000000
--- a/app-misc/selecta-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A fuzzy text selector for files and anything else you need to select
-EAPI=6
-HOMEPAGE=https://github.com/garybernhardt/selecta
-LICENSE=MIT
-RDEPEND=>=dev-lang/ruby-1.9.3
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=3121a5fe9c5109e92972ce831556cfef
diff --git a/app-misc/selecta/Manifest b/app-misc/selecta/Manifest
new file mode 100644
index 000000000000..3c5193912a15
--- /dev/null
+++ b/app-misc/selecta/Manifest
@@ -0,0 +1,4 @@
+DIST selecta-0.0.7.tar.gz 116987 BLAKE2B dda7f21ad939780a1d631086eb669f4824277c9b9bc4a762fa56e201fca3202ee8fab63ea1328dfabf868f4c430456969be99ec1520afcb8c509518f589a3a6a SHA512 7db8fefa51411c6b9996bd1e19889902e807471bb76309bbcace16dcfae70cdb71bdd7abd2c1a96b99d2fe1f9ecbdb1972e95485a2d06b3e3258303a0fef2018
+EBUILD selecta-0.0.7.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+EBUILD selecta-9999.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
diff --git a/app-misc/selecta/metadata.xml b/app-misc/selecta/metadata.xml
new file mode 100644
index 000000000000..6bf484adc0d0
--- /dev/null
+++ b/app-misc/selecta/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>lucianposton@pm.me</email>
+ <name>Lucian Poston</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/selecta/selecta-0.0.7.ebuild b/app-misc/selecta/selecta-0.0.7.ebuild
new file mode 100644
index 000000000000..102d07f58dd5
--- /dev/null
+++ b/app-misc/selecta/selecta-0.0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
+else
+ SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
+HOMEPAGE="https://github.com/garybernhardt/selecta"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ >=dev-lang/ruby-1.9.3"
+
+src_install() {
+ dobin selecta
+ einstalldocs
+}
diff --git a/app-misc/selecta/selecta-9999.ebuild b/app-misc/selecta/selecta-9999.ebuild
new file mode 100644
index 000000000000..102d07f58dd5
--- /dev/null
+++ b/app-misc/selecta/selecta-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
+else
+ SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
+HOMEPAGE="https://github.com/garybernhardt/selecta"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ >=dev-lang/ruby-1.9.3"
+
+src_install() {
+ dobin selecta
+ einstalldocs
+}
diff --git a/app-misc/skim-0.3.2 b/app-misc/skim-0.3.2
deleted file mode 100644
index 9b386bfe977d..000000000000
--- a/app-misc/skim-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=virtual/rust >=dev-util/cargo-0.13.0
-DESCRIPTION=a command-line fuzzy finder
-EAPI=6
-HOMEPAGE=https://github.com/lotabout/skim
-IUSE=tmux vim debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/clap/2.28.0/download -> clap-2.28.0.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.34/download -> libc-0.2.34.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.3.2/download -> skim-0.3.2.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.0/download -> utf8parse-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo 959846e2836f8244430c9582dd6493af multiprocessing cac3169468f893670dac3e7cb940e045
-_md5_=3985c69fa55da23e1eea0313beab50e2
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
new file mode 100644
index 000000000000..eb523dd9d2fa
--- /dev/null
+++ b/app-misc/skim/Manifest
@@ -0,0 +1,32 @@
+DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
+DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
+DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST clap-2.28.0.crate 186934 BLAKE2B 6885cb7a74077b1c72feac97471c08a456f5e826e42b95bb1768027fca127696a457cbb8069e624196e1c77e55608b8ec6b157bfa3e8a661dc0c9b67af903c9c SHA512 737bfa82008082d75ef5f36c5aa505af8e11ff08b7ec824a69f37dcafe1d7ea8e4909a94cf5de218f9bde4cd304e8ec57441b195d936b7db43e8b5881fda0d01
+DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
+DIST libc-0.2.34.crate 304756 BLAKE2B 0a2af3e2a92ac6dfc72d72d26ff2df47b0c8656f22b3a52df02cf8eff787ae638ae8b2c56370da0e9f3831cca325d6073c6d08beedd7c75455c2785ccc5081bc SHA512 5f7a108608c2d202f6d59125aec37679f178cd1e34f0b6cc9384c476179aa45a8f10b5934314e2b2243fba4233bf8b1ce91399c8ba73e41c3591c14debc12856
+DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
+DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
+DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
+DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
+DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
+DIST skim-0.3.2.crate 69623 BLAKE2B af7236145d300033fe4d61f639209660c41c67d9ee1848c9a55e928531fa450c9c69c806abf93fd21e8876d5755143f80ca3746053617b8309c7e36f009761c6 SHA512 3f0358bd48169e9a5bdfc9b7ce1269dd1823b8df4035b0d4c81ee1ae0bc7dfcab696efcaa4bfa6a7e0b0f7143dc2752dd5df45dbf10ce199615f509d6c68efef
+DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
+DIST thread_local-0.3.4.crate 11760 BLAKE2B 7d1c7bc70d6f35a04074ae6d25d14b07f4f48742a8090a1465d2b6cfc9a80e50a737cc75d65f4bd1de226c341d10d630092fee3be74daaada88f567767217403 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d
+DIST time-0.1.38.crate 28500 BLAKE2B f0d98a7288616c2a5a07691e6bfe2bed5b043c9ddec3a6658e2e1dde294af030b635aba1d8c408f0cbe3c4c2692d4e2705d91276fac0c63f5ca03d3be3b19b59 SHA512 9052d6bc6c9222d331d23f7cb79b534bea6b1cc0f259c97f465321bcdad11b643cbd2e9bb3a456770a19a2a84dabfbab55e522cbb745f4c64e228736eaaeaf24
+DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST utf8parse-0.1.0.crate 2927 BLAKE2B 7f199899b6e87f600b77deb69004faafc0b24af50e746f139d32456d461245d9793a7a739389f432fdc2e1617875aed5a03a4fcf4fa58d2f8d0deef788755f02 SHA512 732568bb44eb285fab2d55b90a97786e503ea680e06be606e9ce975d511fee086ecd490cbc5f3daa35deeba039406b9b8ff63c3ef11305436fd5594c6e5dd7b2
+DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+EBUILD skim-0.3.2.ebuild 1243 BLAKE2B 12b4b6ace6d683ec02700b576624576aa6d15f5e2992440d80e558b6178684ef1060e16f7f6eaac49afad4df40a9c2d9fb696829c5be7305e2a4f9a8f73a5993 SHA512 ce00f85f43c33db517ead66810485a2626298501ede7f3520aa1a9e0dc0c68233b2def03507917b97b44ab04d1ba0c17e1de3fd2248edf1d0ef40d5d48586e6f
+MISC metadata.xml 470 BLAKE2B 180746e1e2f48f8024dd0cfb490e8ad2f1ccd4b32b7394f081f251b93b27bfc20e0fe440fe8449ffd52547b055d761428d585d9b6dff4f974a071349c56b87eb SHA512 c38d86b5ce12408946b75aa4537589512ea23eb09fc50354afdfdf266592e0318f0647b35d38de53b837c6f7096cd35584f8aa5395b0aa2076f3b82de389819b
diff --git a/app-misc/skim/metadata.xml b/app-misc/skim/metadata.xml
new file mode 100644
index 000000000000..1ca7d24e80a2
--- /dev/null
+++ b/app-misc/skim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">lotabout/skim</remote-id>
+ </upstream>
+ <use>
+ <flag name="tmux">Install sk-tmux script to run skim in a tmux pane</flag>
+ <flag name="vim">Install vim plugin for skim</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/skim/skim-0.3.2.ebuild b/app-misc/skim/skim-0.3.2.ebuild
new file mode 100644
index 000000000000..7aa141240d6c
--- /dev/null
+++ b/app-misc/skim/skim-0.3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.10.2
+atty-0.2.3
+bitflags-1.0.1
+clap-2.28.0
+env_logger-0.4.3
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+libc-0.2.34
+log-0.3.8
+memchr-2.0.1
+redox_syscall-0.1.32
+redox_termios-0.1.1
+regex-0.2.3
+regex-syntax-0.4.1
+shlex-0.1.1
+skim-0.3.2
+strsim-0.6.0
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.4
+time-0.1.38
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+utf8parse-0.1.0
+vec_map-0.8.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="a command-line fuzzy finder"
+HOMEPAGE="https://github.com/lotabout/skim"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tmux vim"
+
+DEPEND="virtual/rust"
+RDEPEND="
+ tmux? ( app-misc/tmux )
+ vim? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+src_test() {
+ cargo test || die "tests failed"
+}
+
+src_install() {
+ cargo_src_install
+ dodoc CHANGELOG.md README.md
+
+ use tmux && dobin bin/sk-tmux
+
+ if use vim; then
+ insinto /usr/share/vim/vimfiles/plugin
+ doins plugin/skim.vim
+ fi
+
+ # install bash/zsh completion and keybindings
+ insinto /usr/share/${PN}
+ doins shell/{*.bash,*.zsh}
+}
diff --git a/app-misc/sl-5.02 b/app-misc/sl-5.02
deleted file mode 100644
index bc1b7241b6d2..000000000000
--- a/app-misc/sl-5.02
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=sophisticated graphical program which corrects your miss typing
-EAPI=6
-HOMEPAGE=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html https://github.com/mtoyoda/sl/
-IUSE=l10n_ja
-KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=Toyoda
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/mtoyoda/sl/archive/5.02.tar.gz -> sl-5.02.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b3b8f45bf76aee4a5e97f2228e67fc93
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
new file mode 100644
index 000000000000..cbc10616fe49
--- /dev/null
+++ b/app-misc/sl/Manifest
@@ -0,0 +1,3 @@
+DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
+EBUILD sl-5.02.ebuild 877 BLAKE2B ccf1acc3170f6c46f76bdd10f2e10c618d453b099ba43fc18225373b1e47be9c73d5416fef9c481b892cf653356dc36d084a2de7b300e958cc0c472ac9b7bf62 SHA512 f3866e623999c20a2d160a6b14c43c36d0a835370fc25a14cc8c2e6dc312091dff9bfec2f0e49880e338b361de92b15b461a74a1b3964f6bc214647a7705996f
+MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/metadata.xml b/app-misc/sl/metadata.xml
new file mode 100644
index 000000000000..e68cdace86bd
--- /dev/null
+++ b/app-misc/sl/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <longdescription lang="en">
+ SL is an extremely sophisticated type remediation program at which you
+ will be astonished. The original program has experienced gradual
+ modifications and enhancements so that one can never think of better
+ software than SL.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">mtoyoda/sl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
new file mode 100644
index 000000000000..223474eab81f
--- /dev/null
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="sophisticated graphical program which corrects your miss typing"
+HOMEPAGE="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html https://github.com/mtoyoda/sl/"
+SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Toyoda"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+ sed \
+ -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
+ -i Makefile || die
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+
+ if use l10n_ja; then
+ newman "${PN}.1.ja" "${PN}.ja.1"
+ DOCS+=( README.ja.md )
+ fi
+
+ einstalldocs
+}
diff --git a/app-misc/sleepyhead-1.0.0_beta2 b/app-misc/sleepyhead-1.0.0_beta2
deleted file mode 100644
index 0fd47d987060..000000000000
--- a/app-misc/sleepyhead-1.0.0_beta2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=virtual/opengl x11-libs/libX11 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtserialport:5 virtual/glu
-DESCRIPTION=Software used to analyze data from CPAP machines
-EAPI=6
-HOMEPAGE=https://sleepyhead.jedimark.net/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=virtual/opengl x11-libs/libX11 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtserialport:5 virtual/glu
-SLOT=0
-SRC_URI=https://gitlab.com/sleepyhead/sleepyhead-code/repository/archive.tar.bz2?ref=1.0.0-beta-2 -> sleepyhead-1.0.0_beta2.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6caca8b123babf67eca294e020d6caf7
diff --git a/app-misc/sleepyhead/Manifest b/app-misc/sleepyhead/Manifest
new file mode 100644
index 000000000000..2f32955f44dc
--- /dev/null
+++ b/app-misc/sleepyhead/Manifest
@@ -0,0 +1,4 @@
+AUX common_gui.patch 246 BLAKE2B f4b6c9889322f709a19673529d61d8719a55c692d9aeeb2a174ae86134fffc2216a77002ddd1544326e97ad8c0685c8311ad81fe660b22120c47718275b3be29 SHA512 952027395ac82fa3960c5efe9b98acf4a2232380a59fd9d71112ea57d26c94fc9f497e9c1c6e6fd48820f3042b16cc88d9f8b95285e857f1b5580a7e00acf442
+DIST sleepyhead-1.0.0_beta2.tar.bz2 3404013 BLAKE2B a5cf9fcb6a1c91786fffd2cbb2505ebc9608d83f5b6fc4e39fcf74def369a6fd1a40e23bf164c840956a9fe2f2c25ccf7313a95098eb6829632971a6a924ff61 SHA512 147a853bd77e6277b70d5d70f9b82f46c3f6328283c30b38d77e698146519367c9fa02f8fb21c687237657ceb78d7bc9ee07e4e8ccdbe41652ddd8dc55049eca
+EBUILD sleepyhead-1.0.0_beta2.ebuild 1177 BLAKE2B ba5fdec1915a40512342e4423611808770ec6646f9311e8ffa48615e883bbb9f2282fa4db65b71c78f864b0e5b7314fb088ca7c7182823d4a4a88d197a8057a4 SHA512 cc0e8514e6eec60d3aaa0aa0571ee779b79c4ef53237b34288cf3a05973ecb0d321ce6c74511e03d3e40cbc7abe1bab221cef5755b69df18cdbcc2469b7126c9
+MISC metadata.xml 409 BLAKE2B 1777997bf87537da1a8337390065482b53fc2acae84137ebbc54fd13b221b8fc9c48a799ac9efcc6e4853f3610bab85a44679b5780fabaa0b46e1c5e20cedab9 SHA512 bd3522a2a682e51f61f5c38db6003365e06226a2015fe2aa81ed638852a663084da4d4d39962abb36aacc37462d84b706e4b35023e265635904a4d1874044ae8
diff --git a/app-misc/sleepyhead/files/common_gui.patch b/app-misc/sleepyhead/files/common_gui.patch
new file mode 100644
index 000000000000..6e41e0ac4ce9
--- /dev/null
+++ b/app-misc/sleepyhead/files/common_gui.patch
@@ -0,0 +1,12 @@
+diff --git a/common_gui.cpp b/common_gui.cpp
+index 0f38ce8..36b0b9e 100644
+--- a/common_gui.cpp
++++ b/common_gui.cpp
+@@ -6,6 +6,7 @@
+
+ #include "common_gui.h"
+ #include "qglobal.h"
++#include <unistd.h>
+
+ #ifdef Q_WS_WIN32
+ #include "windows.h"
diff --git a/app-misc/sleepyhead/metadata.xml b/app-misc/sleepyhead/metadata.xml
new file mode 100644
index 000000000000..cabb7c423f61
--- /dev/null
+++ b/app-misc/sleepyhead/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>rich0@gentoo.org</email>
+ </maintainer>
+ <longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+ <upstream>
+ <remote-id type="github">rich0/rich0-sleepyhead</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
new file mode 100644
index 000000000000..779450ed1051
--- /dev/null
+++ b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils qmake-utils
+DESCRIPTION="Software used to analyze data from CPAP machines"
+HOMEPAGE="https://sleepyhead.jedimark.net/"
+
+# Point to any required sources; these will be automatically downloaded by
+# Portage.
+SRC_URI="https://gitlab.com/sleepyhead/sleepyhead-code/repository/archive.tar.bz2?ref=1.0.0-beta-2 -> ${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="virtual/opengl
+ x11-libs/libX11
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtserialport:5
+ virtual/glu"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+}
+
+src_prepare() {
+ eapply_user
+ rm configure
+ cd "${S}/3rdparty/quazip/"
+# epatch "${FILESDIR}/common_gui.patch"
+
+ sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
+ quazip/zip.c quazip/zip.h
+ cd "${S}"
+ eqmake5 SleepyHeadQT.pro
+}
+
+src_install() {
+ cd "${S}/sleepyhead"
+ dobin SleepyHead || die
+ dodoc ../README || die
+ dodoc docs/* || die
+}
diff --git a/app-misc/slmon-0.5.13 b/app-misc/slmon-0.5.13
deleted file mode 100644
index 33699e29b344..000000000000
--- a/app-misc/slmon-0.5.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 sys-libs/slang gnome-base/libgtop virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Colored text-based system performance monitor
-EAPI=5
-HOMEPAGE=http://slmon.sourceforge.net
-IUSE=debug
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/slang gnome-base/libgtop
-SLOT=0
-SRC_URI=mirror://sourceforge/slmon/slmon-0.5.13.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cd6781711cc69a930a6b65ff768f5ab
diff --git a/app-misc/slmon/Manifest b/app-misc/slmon/Manifest
new file mode 100644
index 000000000000..c7466580a2f3
--- /dev/null
+++ b/app-misc/slmon/Manifest
@@ -0,0 +1,5 @@
+AUX slmon-0.5.13-invalid-free.patch 383 BLAKE2B 1eb7d8b010aa10c795ca4f5114191a9c97de4e638bf2625d9492bcd258767108c9e801a0f43c442933ac95d61446ec939f809d64adf6a12f77ac220fc8d4a22b SHA512 6cad6d249367e4f2fda9d70d61bab64b6e083da727e1f23fe709c7579efaa3e460c5cf2f01c900517e126b2e9cda069ae8ef1239f731c72ea5728beeabfd522b
+AUX slmon-0.5.13-make-382.patch 243 BLAKE2B 5c926acf2ca9378cb860d70f57b2759b78421022027b9a33bccc20137953c42087f3e3115f6a2d275422680cfbc79926b1f1884e16308c439c2fcbde47350697 SHA512 613388513e5cd7e71b7ec45d1ea5db320f247d74024b52bc9e244c463e22103a165757939527837960aabddeb4feea958d772dca1a2d56747386c8a195beb832
+DIST slmon-0.5.13.tar.gz 103826 BLAKE2B 091e688773043872ec3df0c5dd4acb435ab4a99308e9a13bacae20baa0edf721cf9baed2fb3c33c2ec05085631a0cf858e1ca25b8c557d2aec8ea736c9bfa9a8 SHA512 84bf1e3eda9c05c7029630802b6853cba1c1220fd210c2a8f26f6ffafff3aa5a8bf9945b74ca508fbf4a9038b5df26ebed529d6377fab1df4dd778cccfd74f75
+EBUILD slmon-0.5.13.ebuild 775 BLAKE2B 8a6a8f4db6e498d931afd7a314270854152e71de88a4bbf59cdd1224037d49e200d65349b20bc8ff1a651e6ddb60a4aee45db94117a1e3d542d9c8738fde182d SHA512 19047e1c2fd010625669cb8c383ebf76f52087d201d0fb0f2b33fb02803d7344a27aee82fb8655674b61d97d46990b7fd01fb40e62d3de01e64e2b3217ce36cc
+MISC metadata.xml 242 BLAKE2B 896a9044e8610aae2f30f8782352a32c8765672389ef80eb61eb815c0a70b58a06a991be3700219411c5bcc0b84fd81ffd9d677133d8312c5f265b7a011c57c5 SHA512 8a2bdc32c50597dc61771f9bfcc3d01ddb46cca9cdea7dcc831aca2eafb0746867b49b90885a24e8b8aba0c33a7c174da8955486a9843e50b3e6dc1c9720fd3f
diff --git a/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch b/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
new file mode 100644
index 000000000000..d7b0e24e07d9
--- /dev/null
+++ b/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/151293
+
+--- rc.c
++++ rc.c
+@@ -177,9 +177,10 @@
+ char *home, dotrc[1024] = { 0 };
+
+ home = getenv("HOME");
+- strcpy(dotrc, home);
+- strcat(dotrc, "/.slmonrc");
+- free(home);
++ if ( home != NULL ) {
++ strcpy(dotrc, home);
++ strcat(dotrc, "/.slmonrc");
++ }
+
+ if ((f = fopen("/etc/slmonrc", "r")) != NULL) {
+ slmon_conf_parse(f);
diff --git a/app-misc/slmon/files/slmon-0.5.13-make-382.patch b/app-misc/slmon/files/slmon-0.5.13-make-382.patch
new file mode 100644
index 000000000000..bb128f5803e6
--- /dev/null
+++ b/app-misc/slmon/files/slmon-0.5.13-make-382.patch
@@ -0,0 +1,11 @@
+http://bugs.gentoo.org/337403
+
+--- Makefile.am
++++ Makefile.am
+@@ -15,5 +15,5 @@
+ #slmon_LDFLAGS = `libgtop-config --cflags --libs`
+
+ release:
+- $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
++ $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
+
diff --git a/app-misc/slmon/metadata.xml b/app-misc/slmon/metadata.xml
new file mode 100644
index 000000000000..3ca321c581a3
--- /dev/null
+++ b/app-misc/slmon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">slmon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild
new file mode 100644
index 000000000000..ee5e459384f3
--- /dev/null
+++ b/app-misc/slmon/slmon-0.5.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Colored text-based system performance monitor"
+HOMEPAGE="http://slmon.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="debug"
+
+RDEPEND="
+ dev-libs/glib:2
+ sys-libs/slang
+ gnome-base/libgtop
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-make-382.patch \
+ "${FILESDIR}"/${P}-invalid-free.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable debug)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog README slmonrc TODO
+ dohtml *.html
+}
diff --git a/app-misc/smtm-1.6.10-r1 b/app-misc/smtm-1.6.10-r1
deleted file mode 100644
index c90fc823eea2..000000000000
--- a/app-misc/smtm-1.6.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Tk dev-perl/Date-Manip dev-perl/HTML-Parser dev-perl/Finance-YahooQuote dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
-DESCRIPTION=Stock ticker, profit/loss calculator and chart tool
-EAPI=5
-HOMEPAGE=http://eddelbuettel.com/dirk/code/smtm.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.10.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b712cd565f594542b15252943bfc602a
diff --git a/app-misc/smtm/Manifest b/app-misc/smtm/Manifest
new file mode 100644
index 000000000000..436cb17f0790
--- /dev/null
+++ b/app-misc/smtm/Manifest
@@ -0,0 +1,3 @@
+DIST smtm_1.6.10.tar.gz 54033 BLAKE2B b740298d27949139e593102e1c96337ee4139d18499235cadd1f5030bcde465717adb51cd8b09f2272f286c1489392758f92ba69ded17768c5a91af5773c73cc SHA512 0cacafb8cfe1411b6b5db677bf15ad731b2e2181ee14ff8374e1fa01ad931e8f92efff29774e84950178f20805b18518067643e3c98d7990e1d1b93b7dd347d9
+EBUILD smtm-1.6.10-r1.ebuild 741 BLAKE2B c1092f3aca5a3551453cfac638bf148da688505e92a1036bea481df36a6bd01354826d2bfc29ec9554251dc53347aa9f903e61c2491fbc20b99223cc7e53cf55 SHA512 d9d756a73598140469a65a299361f04e02c2f2edaee61daef435cbae79489df6a9299557fd365b9a62bc18e578991b17f44ce0058acd12e736717d12fbd34278
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/smtm/metadata.xml b/app-misc/smtm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/smtm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/smtm/smtm-1.6.10-r1.ebuild b/app-misc/smtm/smtm-1.6.10-r1.ebuild
new file mode 100644
index 000000000000..c309b8092b42
--- /dev/null
+++ b/app-misc/smtm/smtm-1.6.10-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
+HOMEPAGE="http://eddelbuettel.com/dirk/code/smtm.html"
+SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+# This warrants USE examples
+IUSE=""
+
+DEPEND="dev-perl/Tk
+ dev-perl/Date-Manip
+ dev-perl/HTML-Parser
+ dev-perl/Finance-YahooQuote
+ dev-perl/libwww-perl"
+
+SRC_TEST="do parallel"
+
+src_install() {
+ perl-module_src_install
+ # install examples into own folder for now
+ docompress -x usr/share/doc/${PF}/examples
+ insinto usr/share/doc/${PF}/examples
+ doins examples/*
+}
diff --git a/app-misc/socnetv-2.2 b/app-misc/socnetv-2.2
deleted file mode 100644
index 8a9a90066964..000000000000
--- a/app-misc/socnetv-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-DESCRIPTION=Qt Social Network Visualizer
-EAPI=6
-HOMEPAGE=http://socnetv.sourceforge.net/
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=mirror://sourceforge/socnetv/SocNetV-2.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47867d6f72869916275d3d37f445bd7a
diff --git a/app-misc/socnetv/Manifest b/app-misc/socnetv/Manifest
new file mode 100644
index 000000000000..b73659900d1c
--- /dev/null
+++ b/app-misc/socnetv/Manifest
@@ -0,0 +1,4 @@
+AUX socnetv-2.2-deps.patch 218 BLAKE2B 8f9900b1f9a6d6e9e4a116d3da75aa743d7a193dce8136582eabfa9c183209d4ead2fa782d7cefa5366eb98f1a5e29ac20c8f0b2350982856c05826130b63fc4 SHA512 30fa3fda847aee54452ebbbaea8ae2439dc99fd5b79bdd41517d12effaf2a8e1355257b00e80dabb40e1502a169a8b46bbb98af8ead5239731d35a75b847db03
+DIST SocNetV-2.2.tar.gz 745086 BLAKE2B 3b520df2bb29f1989f744ec7e424caecd722cf3f903cf494e0fba9c0e5c1def413411768f593a3f8c0eb3cc20d1071d54babbd76eb24aac9f6670b4f2623ceb7 SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b
+EBUILD socnetv-2.2.ebuild 820 BLAKE2B 94f3edb120792ed47a24bf70b82ef0505ac1bbace4fd81e1e9598dab12a5e8756bf97b6fd40c5bfed5bac2fe0519d9b6d7f09ab1a8cd280e6ca4b385188b328f SHA512 0a441336e37567f1e1fa1311269067e7601a475c336186b5916dd39d387f1993667247c35abae9e9c673dab53451feb954c692d21fb3848fffa6b4bac4058158
+MISC metadata.xml 871 BLAKE2B ecddd2e7e36a5efa541f554f2ad33ec02570765a02bc00cd7ad8304613a5acf78a783252c6d36bea2edb90334b17ba83709c21cb16cef223cc7cb9bf0570fafa SHA512 d387eeb7d713e4f43f5232f1edba34dc5676c58797838b51301ffed8daf70312117e15c05ce783ba5888cb121b6e8451318c229a998acecedbe6f5fa7aa1120a
diff --git a/app-misc/socnetv/files/socnetv-2.2-deps.patch b/app-misc/socnetv/files/socnetv-2.2-deps.patch
new file mode 100644
index 000000000000..080ff93564a6
--- /dev/null
+++ b/app-misc/socnetv/files/socnetv-2.2-deps.patch
@@ -0,0 +1,10 @@
+--- a/socnetv.pro 2017-01-21 16:50:53.000000000 +0100
++++ b/socnetv.pro 2017-01-28 15:05:26.462351261 +0100
+@@ -34,7 +34,6 @@
+ LANGUAGE = C++
+
+ # support
+-QT += xml
+ QT += network
+ QT += widgets
+ QT += printsupport
diff --git a/app-misc/socnetv/metadata.xml b/app-misc/socnetv/metadata.xml
new file mode 100644
index 000000000000..7831ad505653
--- /dev/null
+++ b/app-misc/socnetv/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <longdescription lang="en">
+ Social Networks Visualizer (SocNetV) is a flexible and user-friendly tool for
+ the analysis and visualization of Social Networks. It lets you construct networks
+ (mathematical graphs) with a few clicks on a virtual canvas or load networks of
+ various formats (GraphViz, GraphML, Adjacency, Pajek, UCINET, etc) and modify them
+ to suit your needs. SocNetV also offers a built-in web crawler, allowing you to
+ automatically create networks from all links found in a given initial URL.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">socnetv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/socnetv/socnetv-2.2.ebuild b/app-misc/socnetv/socnetv-2.2.ebuild
new file mode 100644
index 000000000000..6de2120eae44
--- /dev/null
+++ b/app-misc/socnetv/socnetv-2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils toolchain-funcs
+
+MY_PN="SocNetV"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Qt Social Network Visualizer"
+HOMEPAGE="http://socnetv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/socnetv/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-deps.patch )
+
+src_configure() {
+ eqmake5 socnetv.pro
+}
+
+src_install() {
+ default
+ dobin socnetv
+ doicon src/images/socnetv.png
+ domenu ${PN}.desktop
+ if use examples; then
+ insinto /usr/share/${PN}/examples
+ doins nets/*
+ fi
+ doman "${S}/man/${PN}.1.gz"
+}
diff --git a/app-misc/solaar-0.9.2-r3 b/app-misc/solaar-0.9.2-r3
deleted file mode 100644
index 806b8b34bfad..000000000000
--- a/app-misc/solaar-0.9.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
-EAPI=5
-HOMEPAGE=https://pwr.github.com/Solaar/
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pwr/Solaar/archive/0.9.2.tar.gz -> solaar-0.9.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93c649bb9d87f764248e10900af21dff
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
new file mode 100644
index 000000000000..96dee054e61f
--- /dev/null
+++ b/app-misc/solaar/Manifest
@@ -0,0 +1,3 @@
+DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
+EBUILD solaar-0.9.2-r3.ebuild 1347 BLAKE2B 7d8c92d096e8b8ba1e7edf1d00763cf4dd86e56558784a0374041d191537e30e0d9fd31850a472127fd093b98d8eaebdd31c06ce893b98141749762710b1bd2f SHA512 f49ebacb8c389a33c3ff7e99963fd84d4905b1b23d5a32283c30e1057e9754e00bdbd2cfa2bac7a88d671494378310336c638a5913cf5052ec591899877f2f39
+MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/metadata.xml b/app-misc/solaar/metadata.xml
new file mode 100644
index 000000000000..69c1bb3e2d40
--- /dev/null
+++ b/app-misc/solaar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">pwr/Solaar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/solaar/solaar-0.9.2-r3.ebuild b/app-misc/solaar/solaar-0.9.2-r3.ebuild
new file mode 100644
index 000000000000..25e4dddc082c
--- /dev/null
+++ b/app-misc/solaar/solaar-0.9.2-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 udev user linux-info gnome2-utils
+
+DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+HOMEPAGE="https://pwr.github.com/Solaar/"
+SRC_URI="https://github.com/pwr/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]"
+
+S=${WORKDIR}/Solaar-${PV}
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+ # don't autostart (bug #494608)
+ sed -i '/yield autostart_path/d' setup.py || die
+
+ # grant plugdev group rw access
+ sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ udev_dorules rules.d/*.rules
+
+ dodoc docs/devices.md
+ if use doc; then
+ dodoc -r docs/*
+ fi
+}
+
+pkg_postinst() {
+ enewgroup plugdev
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Users must be in the plugdev group to use this application."
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-misc/sonypid-1.9 b/app-misc/sonypid-1.9
deleted file mode 100644
index a1c29d538db9..000000000000
--- a/app-misc/sonypid-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXtst x11-base/xorg-proto
-DESCRIPTION=tool to use the Sony Vaios jog-dial as a mouse-wheel
-EAPI=5
-HOMEPAGE=http://www.popies.net/sonypi/
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXtst
-SLOT=0
-SRC_URI=http://www.popies.net/sonypi/sonypid-1.9.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=59ce1a1d8df55b2d10aafc6961653af1
diff --git a/app-misc/sonypid/Manifest b/app-misc/sonypid/Manifest
new file mode 100644
index 000000000000..1ade3bf66955
--- /dev/null
+++ b/app-misc/sonypid/Manifest
@@ -0,0 +1,3 @@
+DIST sonypid-1.9.tar.bz2 9710 BLAKE2B edc68ffe6649b6ad7f8afa41666be514b34593bf5f764f29d1ea0d94c335e2f497b7c31b9f0946210b008d6c37e0647b3327476cbc628db24ba7179dc2c25360 SHA512 fcd2b2d2a9db94cd59b8d0f23c41aca2e738e433ecd6818ce84cc1298f5609c84aa16b75e0ce1323e24bf6bb59feccd28c5016549d0690e6dd2f3aae1244e3d0
+EBUILD sonypid-1.9.ebuild 566 BLAKE2B f72d06446e930e4fb6d3d642778ccf1943ebc2af86cafd6581ab405bf22771ee403ed8ace5aa61965abbf3010973036d4471a3845ab7761e6f7c04c9910fad23 SHA512 16335d49a97f2b3238869c6d39fa791d0db8e88f451110e38686b1d8a39b5fb1eed3d22b43fded02eec79a3f802d4f01ee4e810c86817da831e53532b2ab774f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/sonypid/metadata.xml b/app-misc/sonypid/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/sonypid/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild
new file mode 100644
index 000000000000..cb8e02458bd0
--- /dev/null
+++ b/app-misc/sonypid/sonypid-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="tool to use the Sony Vaios jog-dial as a mouse-wheel"
+HOMEPAGE="http://www.popies.net/sonypi/"
+SRC_URI="http://www.popies.net/sonypi/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXtst"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin sonypid
+ dodoc AUTHORS CHANGES
+}
diff --git a/app-misc/spacenavd-0.5-r5 b/app-misc/spacenavd-0.5-r5
deleted file mode 100644
index 5ebcd16704b7..000000000000
--- a/app-misc/spacenavd-0.5-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=X? ( x11-apps/xdpyinfo ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
-EAPI=4
-HOMEPAGE=http://spacenav.sourceforge.net/
-IUSE=X kernel_linux
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-3
-RDEPEND=X? ( x11-apps/xdpyinfo )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13321087eb56f24ea9b07719f4171a13
diff --git a/app-misc/spacenavd-0.5-r6 b/app-misc/spacenavd-0.5-r6
deleted file mode 100644
index 7d31960dbfbd..000000000000
--- a/app-misc/spacenavd-0.5-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=X? ( x11-apps/xdpyinfo ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
-EAPI=5
-HOMEPAGE=http://spacenav.sourceforge.net/
-IUSE=X kernel_linux
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=X? ( x11-apps/xdpyinfo )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=287314a7a951831a4b076abbd81bfd9e
diff --git a/app-misc/spacenavd-0.6 b/app-misc/spacenavd-0.6
deleted file mode 100644
index 4ecef6cdd231..000000000000
--- a/app-misc/spacenavd-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=X? ( x11-apps/xdpyinfo ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
-EAPI=5
-HOMEPAGE=http://spacenav.sourceforge.net/
-IUSE=X kernel_linux
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-3
-RDEPEND=X? ( x11-apps/xdpyinfo )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.6/spacenavd-0.6.tar.gz
-_eclasses_=eapi7-ver d97a56a62c7df8614afddcb25f5ff00f linux-info 8e77ea4def23d38cdf0e8ffa69187d34 multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
-_md5_=acd4fce33880461ffc6a6000f75c54c5
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
new file mode 100644
index 000000000000..e9f82f3f2f6c
--- /dev/null
+++ b/app-misc/spacenavd/Manifest
@@ -0,0 +1,14 @@
+AUX 99-space-navigator.rules 319 BLAKE2B bd7dc7d14d1fece05030151cb85f0b4debfbd8a3dfc78724a2a607467ec1516ca6c0a4af43e4f40a2344496cfd5d8e3ab60190c74af1f81984e0399438e68ff1 SHA512 c66c5738ff980515cc0e6e77f873888b09f30bca54b5c947cc9c8276c388f37c9492d7c2a92420fa3713ca7d7d9f9f3ec5449fa01a71c6897b3204c0ac68fd3c
+AUX 99-space-navigator.rules-r1 478 BLAKE2B 62b2bca510da6b672271d47cfac5c21f6294ba7586068f56a7cc818ff07572e005b1236956d52d286d9e21d057b6ebe489e832c3cc4f8c792e3eed86722920c6 SHA512 6398a8859c4d6e75f8885cf937543adab0c2d58ac80dc151ba814fa28b93086d4848eadb50ee2bbb3059fc11c17b78f334bf8805aaec75dbad41e672b07c8aa1
+AUX 99-space-navigator.rules-r2 461 BLAKE2B b97685a2c3c628bd5a52e66d044d2ef8123c96128ae02ff46c33dffbe9ca5cba63f26ccbbf072872217b8a3a881e65a040b0c51fe91a042867f8a2cda6b6c680 SHA512 6871c629999c5f6c6988709bf15ae2821d8375fe80e3f8271cf285734163b523541dc04e70571a3578eba567e1b04ecb3cc2a57f1fd9f138c62226c07a09e18f
+AUX spacenavd-0.5-custom-flags.patch 2008 BLAKE2B 789dc350c1ef63c052e5ff298dcdd0c0ea4a2911153b51a01d3b933c855865d752e5cda72eb23fbdfa0c4170469b0858e205b724dc1cd4b52d497ea114748af1 SHA512 547d9f3098846901418acb71be996cec39bf18616e4a7eee5fc09bc201bfb2a534ff70f38d515b0f6c685330d002ea277c03b448ba70de4a3df65e6286780174
+AUX spacenavd-0.5-destdir.patch 649 BLAKE2B 7a3159e7820c03cc5d38ca54a732abc46c2436e277353283c0bd70fb3f0e3d60adc99f925b5c94d5873cb9a8234e12c86fa1dcf549f87c9fb008b6d46e18655e SHA512 4330ae7b49e661a60f01931716f9924c01cade4e169b3de48ec08039099ce10c6dfe5c8df9a3b01c1890ccb83b3c92d45ea06f5fd9465c3f1514902cc375e1f0
+AUX spacenavd-0.5-no-x11.patch 388 BLAKE2B 14c4cac74d5eb13d2c3619b5dde2296f934dfb6215dfe72538d2135eaddf39097100d6e048fe8dfe5e3acaddba02582d7195f7537a6e10b2bdd4e97864430a0a SHA512 d6cb2d6337b3e19ef56f5e0ccbfdc731b038009df852b3d1f7272001aa18e70a1701c3af2d1b4976cac7392a6176c0f4cee787d2c9b4b96ba029d1cc0db3d7ae
+AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
+AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
+DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
+DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0d375ab4aadc635f7b26884df2ae58585e82dc3978892d04d139cc6c4704fedc300508f9314478f19d4ee11b6 SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200
+EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
+EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
+EBUILD spacenavd-0.6.ebuild 2230 BLAKE2B f536ec95b124cce754294a8e5664c0d3b23d907ef74d296ba910ef09a1e1fa12a4205719b9d72eadc07bed677e0ec0995cfea0c9f926cd819bdb01922b2cc413 SHA512 aa5c1d28e0f21c2a12abce33b32001df0b708d0424136694ca222b9016a701af08eadf7d78141483720c7b72871313389286abfd70bd3fbd573ab5d4d65be827
+MISC metadata.xml 1044 BLAKE2B a38794b340bd633034a037621929c22a0673f3cd69725407a0c84e47143cc600e27e2c5b53224374741dbb0e02250f6e52485e4c011594cea986f927ae066c4e SHA512 04b15a567deac4a6bc1a0b250c585d863d9bebdca0a5160a3b77e1830190abadf1b98371b33e60a8d67978de3f0db117d51d598a861782663cf7b35e74a5d859
diff --git a/app-misc/spacenavd/files/99-space-navigator.rules b/app-misc/spacenavd/files/99-space-navigator.rules
new file mode 100644
index 000000000000..ef2640e65715
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules
@@ -0,0 +1,5 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space Navigator", RUN+="/etc/init.d/spacenavd --quiet start"
diff --git a/app-misc/spacenavd/files/99-space-navigator.rules-r1 b/app-misc/spacenavd/files/99-space-navigator.rules-r1
new file mode 100644
index 000000000000..fa5dc93fcca5
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules-r1
@@ -0,0 +1,6 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space Navigator", RUN+="/etc/init.d/spacenavd --quiet start"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="SpaceNavigator", TAG+="systemd", ENV{SYSTEMD_WANTS}+="spacenavd.service"
diff --git a/app-misc/spacenavd/files/99-space-navigator.rules-r2 b/app-misc/spacenavd/files/99-space-navigator.rules-r2
new file mode 100644
index 000000000000..47d013275b61
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules-r2
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space*", RUN+="/etc/init.d/spacenavd --quiet start"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="spacenavd.service"
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
new file mode 100644
index 000000000000..3b834a43952d
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
@@ -0,0 +1,67 @@
+diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
+--- spacenavd-0.5.orig/Makefile.in 2012-01-31 22:22:20.460368687 +0100
++++ spacenavd-0.5/Makefile.in 2012-01-31 22:23:18.170367675 +0100
+@@ -6,8 +6,8 @@ ctl = spnavd_ctl
+
+ CC = gcc
+ INSTALL = install
+-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src
+-LDFLAGS = $(xlib)
++CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src
++LDFLAGS = $(ldopt) $(xlib)
+
+ $(bin): $(obj)
+ $(CC) -o $@ $(obj) $(LDFLAGS)
+diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure
+--- spacenavd-0.5.orig/configure 2012-01-31 22:22:20.460368687 +0100
++++ spacenavd-0.5/configure 2012-01-31 22:22:49.257368187 +0100
+@@ -28,6 +28,7 @@ test_kver() {
+
+ PREFIX=/usr/local
+ OPT=yes
++LDOPT=yes
+ DBG=yes
+ X11=yes
+ HOTPLUG=yes
+@@ -70,6 +71,11 @@ for arg; do
+ --disable-opt)
+ OPT=no;;
+
++ --enable-ldopt)
++ LDOPT=yes;;
++ --disable-ldopt)
++ LDOPT=no;;
++
+ --enable-debug)
+ DBG=yes;;
+ --disable-debug)
+@@ -95,6 +101,8 @@ for arg; do
+ echo ' --disable-hotplug: disable hotplug, fallback to polling for the device'
+ echo ' --enable-opt: enable speed optimizations (default)'
+ echo ' --disable-opt: disable speed optimizations'
++ echo ' --enable-ldopt: enable link optimizations (default)'
++ echo ' --disable-ldopt: disable link optimizations'
+ echo ' --enable-debug: include debugging symbols (default)'
+ echo ' --disable-debug: do not include debugging symbols'
+ echo 'all invalid options are silently ignored'
+@@ -105,6 +113,7 @@ done
+
+ echo " prefix: $PREFIX"
+ echo " optimize for speed: $OPT"
++echo " optimize link: $LDOPT"
+ echo " include debugging symbols: $DBG"
+ echo " x11 communication method: $X11"
+ echo " use hotplug: $HOTPLUG"
+@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then
+ fi
+
+ if [ "$OPT" = 'yes' ]; then
+- echo 'opt = -O3' >>Makefile
++ echo "opt = ${CFLAGS:--O3}" >>Makefile
++fi
++
++if [ "$LDOPT" = 'yes' ]; then
++ echo "ldopt = ${LDFLAGS}" >>Makefile
+ fi
+
+ if [ "$X11" = 'yes' ]; then
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
new file mode 100644
index 000000000000..5b2372242e14
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
@@ -0,0 +1,16 @@
+diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
+--- spacenavd-0.5.orig/Makefile.in 2011-11-16 21:43:53.210859753 +0100
++++ spacenavd-0.5/Makefile.in 2011-11-16 21:45:36.386857932 +0100
+@@ -24,9 +24,9 @@ clean:
+
+ .PHONY: install
+ install: $(bin)
+- $(INSTALL) -d $(PREFIX)/bin
+- $(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin)
+- $(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl)
++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
++ $(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
++ $(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl)
+ cd $(srcdir) && ./setup_init --no-install
+
+ # [ -d /etc/hal/fdi/policy ] && \
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
new file mode 100644
index 000000000000..bbdd7d6196ec
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
@@ -0,0 +1,13 @@
+diff -Npur spacenavd-0.5.old/src/event.c spacenavd-0.5/src/event.c
+--- src/event.c 2012-03-21 22:15:37.093401293 +0100
++++ src/event.c 2012-03-21 22:14:10.734401301 +0100
+@@ -20,7 +20,9 @@ along with this program. If not, see <h
+ #include <stdlib.h>
+ #include "event.h"
+ #include "client.h"
++#ifdef USE_X11
+ #include "proto_x11.h"
++#endif
+ #include "proto_unix.h"
+ #include "spnavd.h"
+
diff --git a/app-misc/spacenavd/files/spacenavd.service b/app-misc/spacenavd/files/spacenavd.service
new file mode 100644
index 000000000000..b9b14d80086a
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=3Dconnexion Input Devices Userspace Driver
+
+[Service]
+ExecStart=/usr/bin/spacenavd -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/spacenavd/files/spnavd b/app-misc/spacenavd/files/spnavd
new file mode 100644
index 000000000000..6bbe49a7bbf0
--- /dev/null
+++ b/app-misc/spacenavd/files/spnavd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+ need localmount
+ after bootmisc
+}
+
+start() {
+ ebegin "Starting Spacenav system daemon"
+
+ start-stop-daemon --start --pidfile /var/run/spnavd.pid --exec /usr/bin/spacenavd
+ eend $?
+}
+
+stop() {
+ local retval
+
+ ebegin "Stopping Spacenav system daemon"
+
+ start-stop-daemon --stop --pidfile /var/run/spnavd.pid
+ retval=$?
+
+ eend ${retval}
+ return ${retval}
+}
diff --git a/app-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml
new file mode 100644
index 000000000000..3e3914927158
--- /dev/null
+++ b/app-misc/spacenavd/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>anthoine.bourgeois@gmail.com</email>
+ <name>Anthoine Bourgeois</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ The spacenavd daemon can be used directly as a drop-in replacement
+ to the 3DxWare daemon. It can communicate with the official magellan
+ SDK, and thus any program compiled with it can work with spacenavd
+ transparently without any change or need of recompilation.
+ Also, spacenavd provides an alternative communication protocol, for
+ programs that use libspnav, that doesn't require an X server, as the
+ original protocol does.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">spacenav</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/spacenavd/spacenavd-0.5-r5.ebuild b/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
new file mode 100644
index 000000000000..e586369f045c
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ CONFIG_CHECK="~INPUT_EVDEV"
+ ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+ check_extra_config
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-destdir.patch
+ epatch "${FILESDIR}"/${P}-custom-flags.patch
+ epatch "${FILESDIR}"/${P}-no-x11.patch
+}
+
+src_configure() {
+ econf \
+ --enable-opt --enable-ldopt \
+ $(use_enable X x11)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ # Config file
+ insinto /etc
+ newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+ # Init script
+ newinitd "${FILESDIR}/spnavd" spacenavd
+ systemd_dounit "${FILESDIR}/spacenavd.service"
+
+ # Install udev rule but leave activiation to the user
+ # since Xorg may be configured to grab the device already
+ insinto "$(get_udevdir)"
+ newins "${FILESDIR}"/99-space-navigator.rules-r1 99-space-navigator.rules.ignored
+
+ # Daemon
+ dobin "${S}/spacenavd"
+ use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+ elog "To start the Spacenav daemon system-wide by default"
+ elog "you should add it to the default runlevel :"
+ elog "\`rc-update add spacenavd default\` (for openRC)"
+ elog "\`systemctl enable spacenavd\` (for systemd)"
+ elog
+ if use X; then
+ elog "To start generating Spacenav X events by default"
+ elog "you should add this command in your user startup"
+ elog "scripts such as .gnomerc or .xinitrc :"
+ elog "\`spnavd_ctl x11 start\`"
+ elog
+ fi
+ elog
+ elog "If you want to auto-start the daemon when you plug in"
+ elog "a SpaceNavigator device, activate the related udev rule :"
+ elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+ ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+ ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+ ewarn "if using systemd."
+}
diff --git a/app-misc/spacenavd/spacenavd-0.5-r6.ebuild b/app-misc/spacenavd/spacenavd-0.5-r6.ebuild
new file mode 100644
index 000000000000..21dab6b21ab9
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.5-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ CONFIG_CHECK="~INPUT_EVDEV"
+ ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+ check_extra_config
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-destdir.patch
+ epatch "${FILESDIR}"/${P}-custom-flags.patch
+ epatch "${FILESDIR}"/${P}-no-x11.patch
+}
+
+src_configure() {
+ econf \
+ --enable-opt --enable-ldopt \
+ $(use_enable X x11)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ # Config file
+ insinto /etc
+ newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+ # Init script
+ newinitd "${FILESDIR}/spnavd" spacenavd
+ systemd_dounit "${FILESDIR}/spacenavd.service"
+
+ # Install udev rule but leave activiation to the user
+ # since Xorg may be configured to grab the device already
+ udev_newrules "${FILESDIR}"/99-space-navigator.rules-r1 99-space-navigator.rules.ignored
+
+ # Daemon
+ dobin "${S}/spacenavd"
+ use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+ elog "To start the Spacenav daemon system-wide by default"
+ elog "you should add it to the default runlevel :"
+ elog "\`rc-update add spacenavd default\` (for openRC)"
+ elog "\`systemctl enable spacenavd\` (for systemd)"
+ elog
+ if use X; then
+ elog "To start generating Spacenav X events by default"
+ elog "you should add this command in your user startup"
+ elog "scripts such as .gnomerc or .xinitrc :"
+ elog "\`spnavd_ctl x11 start\`"
+ elog
+ fi
+ elog
+ elog "If you want to auto-start the daemon when you plug in"
+ elog "a SpaceNavigator device, activate the related udev rule :"
+ elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+ ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+ ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+ ewarn "if using systemd."
+}
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
new file mode 100644
index 000000000000..86b0c8ae3156
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ CONFIG_CHECK="~INPUT_EVDEV"
+ ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+ check_extra_config
+}
+
+src_configure() {
+ econf \
+ --disable-debug \
+ --enable-hotplug \
+ --disable-opt \
+ $(use_enable X x11)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ add_cflags="${CFLAGS}" \
+ add_ldflags="${LDFLAGS}"
+}
+
+src_install() {
+ # Config file
+ insinto /etc
+ newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+ # Init script
+ newinitd "${FILESDIR}/spnavd" spacenavd
+ systemd_dounit "${FILESDIR}/spacenavd.service"
+
+ # Install udev rule but leave activiation to the user
+ # since Xorg may be configured to grab the device already
+ udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+ # Daemon
+ dobin "${S}/spacenavd"
+ use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+ elog "To start the Spacenav daemon system-wide by default"
+ elog "you should add it to the default runlevel :"
+ elog "\`rc-update add spacenavd default\` (for openRC)"
+ elog "\`systemctl enable spacenavd\` (for systemd)"
+ elog
+ if use X; then
+ elog "To start generating Spacenav X events by default"
+ elog "you should add this command in your user startup"
+ elog "scripts such as .gnomerc or .xinitrc :"
+ elog "\`spnavd_ctl x11 start\`"
+ elog
+ fi
+ elog
+ elog "If you want to auto-start the daemon when you plug in"
+ elog "a SpaceNavigator device, activate the related udev rule :"
+ elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+ ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+ ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+ ewarn "if using systemd."
+}
diff --git a/app-misc/sphinx-2.0.10 b/app-misc/sphinx-2.0.10
deleted file mode 100644
index 0f85cf5248b8..000000000000
--- a/app-misc/sphinx-2.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.sphinxsearch.com/
-IUSE=debug id64 mysql odbc postgres stemmer test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) virtual/libiconv
-SLOT=0
-SRC_URI=http://sphinxsearch.com/files/sphinx-2.0.10-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=511de4760f0008b14f4e34def9bf0176
diff --git a/app-misc/sphinx-2.1.9 b/app-misc/sphinx-2.1.9
deleted file mode 100644
index 97fff2daab80..000000000000
--- a/app-misc/sphinx-2.1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.sphinxsearch.com/
-IUSE=debug id64 mysql odbc postgres stemmer syslog test xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) stemmer? ( dev-libs/snowball-stemmer ) xml? ( dev-libs/expat ) virtual/libiconv
-SLOT=0
-SRC_URI=http://sphinxsearch.com/files/sphinx-2.1.9-release.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c11042383df73ef05e588bb4b643f32
diff --git a/app-misc/sphinx-2.2.11 b/app-misc/sphinx-2.2.11
deleted file mode 100644
index 9091b8931077..000000000000
--- a/app-misc/sphinx-2.2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.sphinxsearch.com/
-IUSE=debug +id64 mysql odbc postgres re2 stemmer syslog xml
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) re2? ( dev-libs/re2 ) stemmer? ( dev-libs/snowball-stemmer ) xml? ( dev-libs/expat ) virtual/libiconv
-SLOT=0
-SRC_URI=http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d23597beaa81ee69bc8122b1806c106
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
new file mode 100644
index 000000000000..418b75d84527
--- /dev/null
+++ b/app-misc/sphinx/Manifest
@@ -0,0 +1,10 @@
+AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
+AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
+DIST libstemmer_c-20091122.tgz 129207 BLAKE2B 8ebf49f4d2b7dd5d0e56e5a032f16e807cc7c400b4c4a0e73601ace17908b441789ceca87c0258c17b4201b43751df5fad890fecc3a1aaeba60f83c80beecf32 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d
+DIST sphinx-2.0.10-release.tar.gz 2016687 BLAKE2B 176a14c2e1ecc859f5499eab2b2ee9cb9047ec6d07b407c0dbd3a405a9ca6198e1480166a245f7f523e3c3555bf8fe7ad7f0733bce5371f1b35ce6894dfafa6c SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
+DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
+DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
+EBUILD sphinx-2.0.10.ebuild 2620 BLAKE2B 8329b372b512e49efa8a7219385238030d9db3170768734477a0ee4ff97adf8e66687c67865117b67a871a1f160fec2224da4c0b88582162bfbfcd3d275b79d8 SHA512 e72c9596d0de50ca35247ac38ea5c03370e543d5e5faa0ac623ded3a93f7cd3c8f89c400a39c92427948182c4dc3e2a82cf744d766d69982b016a8cf33e70c0e
+EBUILD sphinx-2.1.9.ebuild 2355 BLAKE2B e0e66da428b8b3e1c99de3f2ceb3879ab42433020883bb96afb9b01ac5ef411e871bad56d4cd6ac16f32550c1f4a391f6f3a7b6959d97e83f443ee906df72a35 SHA512 0b6861b2d6625e11fd12b3d2eec4659d1392723877525c152f0723f23192f57e44c4946bc8632c93837821dd32fef0abad77a563dd4eecd5fbda59f1c8d8a6f5
+EBUILD sphinx-2.2.11.ebuild 2379 BLAKE2B 638b663c4a9c517f6bd9614834f8ca5eb4196adab3da818e6e9b498ce7ff0118f344df8dcf2f0cc1c84adb1c5444571d8be98b6e497b278139c3d095b78e6e91 SHA512 658227af2ac8ce1a5e1d0ac852528d2097ff8019470e9a50ea4c9f76a930dfccd83cbb1b7f57567bb8924236092be8b584c15203e7362c51564b1189eb06cd38
+MISC metadata.xml 436 BLAKE2B fd5aeae58f468becae46cbc4c5efb4d42507590f85d881427357c220a36db5ebb775e163bfdeab34199dbbffb2fbcc4d1c9aae8a831d3ecfd7b4505e39eb6a89 SHA512 3083764b80745c3f6dd81c1bc9c2f406edcef6a451d49a79f952969db07c7741447df2b82a82a627b5ebe680f3ea36f99128ae701b553895f15b7bed0d8abecd
diff --git a/app-misc/sphinx/files/searchd.rc b/app-misc/sphinx/files/searchd.rc
new file mode 100644
index 000000000000..55ff0e9c9b77
--- /dev/null
+++ b/app-misc/sphinx/files/searchd.rc
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+ use logger
+}
+
+checkconfig() {
+ if [ ! -f /etc/sphinx/sphinx.conf ] ; then
+ eerror "Please create /etc/sphinx/sphinx.conf"
+ eerror "Sample conf: /etc/sphinx/sphinx.conf.dist"
+ return 1
+ fi
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+
+ ebegin "Starting sphinx searchd"
+ start-stop-daemon --start --exec /usr/bin/searchd
+ eend $? "Failed to start sphinx searchd"
+}
+
+stop() {
+ ebegin "Stopping sphinx searchd"
+ start-stop-daemon --stop --exec /usr/bin/searchd
+ eend $? "Failed to stop sphinx searchd"
+}
diff --git a/app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch b/app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch
new file mode 100644
index 000000000000..e0dcd54097fd
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch
@@ -0,0 +1,22 @@
+Darwin8 has no backtrace functionalities yet
+
+--- src/sphinxutils.cpp
++++ src/sphinxutils.cpp
+@@ -1364,6 +1364,9 @@
+ }
+ sphSafeInfo ( iFD, "Stack bottom = 0x%p, thread stack size = 0x%x", pMyStack, iStackSize );
+
++#ifndef SIGRETURN_FRAME_OFFSET
++ sphLogFatal ( "Cannot get stack frame pointer on this architecture" );
++#else
+ while ( pMyStack && !bSafe )
+ {
+ sphSafeInfo ( iFD, "begin of manual backtrace:" );
+@@ -1421,6 +1424,7 @@
+
+ break;
+ }
++#endif
+
+ #if HAVE_BACKTRACE
+ sphSafeInfo ( iFD, "begin of system backtrace:" );
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
new file mode 100644
index 000000000000..80a8842e3c97
--- /dev/null
+++ b/app-misc/sphinx/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>graaff@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name="id64">use 64-bit document and word IDs</flag>
+ <flag name="re2">use the <pkg>dev-libs/re2</pkg> regular expression library</flag>
+ <flag name="stemmer">Enable language stemming support</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild b/app-misc/sphinx/sphinx-2.0.10.ebuild
new file mode 100644
index 000000000000..8e0c6d4c8562
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+# This has been added by Gentoo, to explicitly version libstemmer.
+# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
+# fetched.
+STEMMER_PV="20091122"
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
+ stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug id64 mysql odbc postgres stemmer test"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ virtual/libiconv"
+DEPEND="${RDEPEND}
+ test? ( dev-lang/php )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+ if use stemmer; then
+ cd "${S}"
+ unpack libstemmer_c-${STEMMER_PV}.tgz
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with stemmer libstemmer)
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ elog "Tests require access to a live MySQL database and may require configuration."
+ elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+ dodoc doc/*
+
+ dodir /var/lib/sphinx
+ dodir /var/log/sphinx
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+
+ if use test; then
+ insinto /usr/share/${PN}
+ doins -r test
+ fi
+}
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild
new file mode 100644
index 000000000000..54eaa42baca2
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ elog "Tests require access to a live MySQL database and may require configuration."
+ elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+ dodoc doc/*
+
+ dodir /var/lib/sphinx
+ dodir /var/log/sphinx
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+
+ if use test; then
+ insinto /usr/share/${PN}
+ doins -r test
+ fi
+}
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
new file mode 100644
index 000000000000..4284f2a9dabf
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ re2? ( dev-libs/re2 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+
+ # Drop bundled code to ensure building against system versions. We
+ # cannot remove libstemmer_c since configure updates its Makefile.
+ rm -rf libexpat libre2 || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with re2) \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ # Tests require a live database and only work from the source
+ # directory.
+ :
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+ dodoc doc/*
+
+ dodir /var/lib/sphinx
+ dodir /var/log/sphinx
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+}
diff --git a/app-misc/splitvt-1.6.6-r3 b/app-misc/splitvt-1.6.6-r3
deleted file mode 100644
index 4fd1d247dbe6..000000000000
--- a/app-misc/splitvt-1.6.6-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=Splitting terminals into two shells
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://slouken.libsdl.org/projects/splitvt/splitvt-1.6.6.tar.gz mirror://debian/pool/main/s/splitvt/splitvt_1.6.6-7.diff.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=112453f9a9c658c164c8f77568b807e5
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
new file mode 100644
index 000000000000..a237bc90a1ef
--- /dev/null
+++ b/app-misc/splitvt/Manifest
@@ -0,0 +1,5 @@
+AUX 1.6.6-ldflags.patch 1048 BLAKE2B 0e67a86bf33ffb3513263f58ec8ad9d7764af054eef60c5c5d1169cbf0d6e142db79b81c9e1faf4f374866ddc0f7201846c3eba4a99ef316eac5c5371f86d106 SHA512 032092bdd9c99917a7a446f4dc66f3fd4d91329eee9992d3026525c969d6a01420eb9131bf51bb92afe79bf2e194ad9ac039e16ac168686b7e534591cfe90307
+DIST splitvt-1.6.6.tar.gz 64797 BLAKE2B cc867fe7cf57b541f5d124bb3bbac111e0cd4a4ef835df7c8abfc7e73c1d172f0a75512e54245b395d815308b6bf94d79c8b896099a4af51e8947ddf177e88bc SHA512 a0a0ea2251489f14e2ba7af9bb1b9d309d6fa310f434090d97af2a0805c398731dec45a5cc15c2074af4d3f33b02c5bab019743530619755382af80ff86fa670
+DIST splitvt_1.6.6-7.diff.gz 11073 BLAKE2B 595381265ecd1d7a654fbce4afde5f872e7ce35d3cd44936f78a3c714b7964586d7ec0ec17d986a0f2e6ff9c3e01cf3563b54185f2fa10bebc9ababd174d4879 SHA512 620f3f6e7f22284ef8054e371a87421beeb2ef355b7084748cbd1f7a3a128c9da11f291fdaf1d393010c0f7affce8d6e56a7ae0977d9831b9d3b98963c55c71f
+EBUILD splitvt-1.6.6-r3.ebuild 1112 BLAKE2B 085ed6bf9488adf9350d7f0c39eee39104c97380d88fc334c543aed1687d70e1d2a6689f8c518b375a0b77cf7db833fe897e80b70650e177cdcbe623ce46e555 SHA512 8ba3c0d8b963977b0aa70d37540223f2a85bdada5181b438970f87cc422bdb1c7357611c07768cb0e815e0db40115de05b7d5b0ace6e9cb73a89cae4802c1e8d
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/splitvt/files/1.6.6-ldflags.patch b/app-misc/splitvt/files/1.6.6-ldflags.patch
new file mode 100644
index 000000000000..5a545ad98ee8
--- /dev/null
+++ b/app-misc/splitvt/files/1.6.6-ldflags.patch
@@ -0,0 +1,23 @@
+diff --git a/config.c b/config.c
+index 6e8b090..2f3c8dc 100644
+--- a/config.c
++++ b/config.c
+@@ -229,15 +229,15 @@ char *argv[];
+ }
+ fprintf(makefile,
+ "PTYOPTS = -DPTYCHAR=$(PTYCHAR) -DHEXDIGIT=$(HEXDIGIT)\n");
+- sprintf(line, "\nCFLAGS = -Wall %s $(PTYOPTS)\nLIBS = %s\n", cflags, ldflags);
++ sprintf(line, "\nCFLAGS = %s $(PTYOPTS)\nLIBS = %s\n", cflags, ldflags);
+ fprintf(makefile, "%s", line);
+ fprintf(makefile, "OBJS = splitvt.o misc.o utmp.o vt100.o videomem.o terminal.o vttest.o vtmouse.o \\\n");
+ fprintf(makefile, " parserc.o lock.o cut-paste.o\n\n");
+ fprintf(makefile, "splitvt: $(OBJS)\n");
+ #if defined(linux) && !defined(DEBUG)
+- fprintf(makefile, "\t$(CC) -o $@ $(OBJS) $(LIBS)\n");
++ fprintf(makefile, "\t$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)\n");
+ #else
+- fprintf(makefile, "\t$(CC) -o $@ $(OBJS) $(LIBS)\n");
++ fprintf(makefile, "\t$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)\n");
+ #endif
+ fprintf(makefile, "\nclean: \n\trm -f *.o core \n");
+ fprintf(makefile, "\ndistclean: clean\n\trm -f splitvt Makefile\n");
diff --git a/app-misc/splitvt/metadata.xml b/app-misc/splitvt/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/splitvt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
new file mode 100644
index 000000000000..989507ca2951
--- /dev/null
+++ b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/-/_}"
+DEB_PL="7"
+
+DESCRIPTION="Splitting terminals into two shells"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+ https://slouken.libsdl.org/projects/splitvt/${P}.tar.gz
+ mirror://debian/pool/main/s/splitvt/${MY_P}-${DEB_PL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc sparc x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${WORKDIR}"/${MY_P}-${DEB_PL}.diff
+ "${FILESDIR}"/${PV}-ldflags.patch
+)
+
+DOCS=( ANNOUNCE BLURB CHANGES NOTES README TODO )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:/usr/local/bin:${D}/usr/bin:g" \
+ -e "s:/usr/local/man/:${D}/usr/share/man/:g" config.c || die
+}
+
+src_configure() {
+ # upstream has their own weirdo configure script...
+ ./configure || die "configure failed"
+ sed -i \
+ -e "s:-O2:${CFLAGS}:" \
+ -e "s:^CC = gcc:CC = $(tc-getCC):" Makefile || die
+}
+
+src_install() {
+ dodir /usr/bin /usr/share/man/man1
+ default
+ fperms 755 /usr/bin/xsplitvt
+ doman splitvt.1
+}
diff --git a/app-misc/srm-1.2.15 b/app-misc/srm-1.2.15
deleted file mode 100644
index c8172ba2a6e8..000000000000
--- a/app-misc/srm-1.2.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=!app-misc/secure-delete sys-kernel/linux-headers >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A command-line compatible rm which destroys file contents before unlinking
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/srm/
-IUSE=debug
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://sourceforge/srm/srm-1.2.15.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71708df52e1be6963d3734a260036c62
diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
new file mode 100644
index 000000000000..9f6c0d5d4f7e
--- /dev/null
+++ b/app-misc/srm/Manifest
@@ -0,0 +1,4 @@
+AUX srm-1.2.15-cflags.patch 343 BLAKE2B e6159fdc6211273859215dc2a90fe598a1c956bef5aa69c02cb6bef54129873e71189d1646d04cb89f3be8bf968cc23631452e089a819d57d4fe3681ff3e4dd9 SHA512 81196944b68b0bff7b32a16dd749cc15ce73c125dba6bfa175dbc38b4baf3a291702139ae63f900e94c3babdacf769fc943992e192371c5c7073275320f0f9c6
+DIST srm-1.2.15.tar.gz 132031 BLAKE2B f01fd8fce0095f5d2247026d3627fc8100b1bc9263f947f2d8500c999220c781ff109283c25b480fe295deb7e162f246afbad68c0797e0fec180ff57f1ff87be SHA512 a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2
+EBUILD srm-1.2.15.ebuild 825 BLAKE2B 1f94efecbfd09c9689e09c3524c804938d2348a1ec2a4e2136140db5164ab382fad14d048905d6450fdd44c86dfa7ff34b984a46f0c9928bb06dec8ad5c917af SHA512 cd3ca3a093d981c404b22ae7053545ab2e2090b1c843198b20a23c338d174956aa50970802fbfc429c7296691d5dffbfbf88a5aa5a511ceeb458f768c45c13f3
+MISC metadata.xml 326 BLAKE2B 636855bc40c79e71abaecf65d197fd8f963e639bcf150cbb8afb9426b76ae73b4104e1c3a9d5cf0c10d3f871c137a55afeee0a3ddb04f4b79cbef7f187f4e04e SHA512 721014538f226f65a6d673e52715b7802e714f87fb8c98c74e610ea603f1cd72504da9229d72e15012fee7fc3d17f6c1b702e1ad5ec300b9696f8b717b492293
diff --git a/app-misc/srm/files/srm-1.2.15-cflags.patch b/app-misc/srm/files/srm-1.2.15-cflags.patch
new file mode 100644
index 000000000000..0a45bdc12520
--- /dev/null
+++ b/app-misc/srm/files/srm-1.2.15-cflags.patch
@@ -0,0 +1,10 @@
+--- srm-1.2.15/configure.ac
++++ srm-1.2.15/configure.ac
+@@ -42,7 +42,6 @@
+ AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging
+ [default=$debug_default]],, enable_debug=$debug_default)
+ if test "x$enable_debug" = "xyes"; then
+- CFLAGS="$CFLAGS -g"
+ AC_MSG_RESULT(yes)
+ else
+ CFLAGS="$CFLAGS -DNDEBUG"
diff --git a/app-misc/srm/metadata.xml b/app-misc/srm/metadata.xml
new file mode 100644
index 000000000000..ebb6d1580d6d
--- /dev/null
+++ b/app-misc/srm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>titanofold@gentoo.org</email>
+ <name>Aaron W. Swenson</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">srm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/srm/srm-1.2.15.ebuild b/app-misc/srm/srm-1.2.15.ebuild
new file mode 100644
index 000000000000..c4fef52773d4
--- /dev/null
+++ b/app-misc/srm/srm-1.2.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking"
+HOMEPAGE="https://sourceforge.net/projects/srm/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="debug"
+
+DEPEND="!app-misc/secure-delete
+ sys-kernel/linux-headers
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.2.15-cflags.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable debug)
+}
+
+pkg_postinst() {
+ ewarn "Please note that srm will not work as expected with any journaled file"
+ ewarn "system (e.g., reiserfs, ext3)."
+ ewarn "See: ${EROOT%/}/usr/share/doc/${PF}/README"
+}
diff --git a/app-misc/supercat-0.5.5-r2 b/app-misc/supercat-0.5.5-r2
deleted file mode 100644
index db1b682a55df..000000000000
--- a/app-misc/supercat-0.5.5-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A text file colorizer using powerful regular expressions
-EAPI=6
-HOMEPAGE=http://supercat.nosredna.net
-KEYWORDS=amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://supercat.nosredna.net/supercat-0.5.5.tar.gz
-_md5_=c58c0eeadba50da3f8e87f993d843246
diff --git a/app-misc/supercat-0.5.6 b/app-misc/supercat-0.5.6
deleted file mode 100644
index ee79e0d4a942..000000000000
--- a/app-misc/supercat-0.5.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A text file colorizer using powerful regular expressions
-EAPI=6
-HOMEPAGE=http://supercat.nosredna.net
-KEYWORDS=~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://supercat.nosredna.net/supercat-0.5.6.tar.gz
-_md5_=f199ce86016f96ce031871e906372191
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
new file mode 100644
index 000000000000..591ffb8d6a21
--- /dev/null
+++ b/app-misc/supercat/Manifest
@@ -0,0 +1,5 @@
+DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
+DIST supercat-0.5.6.tar.gz 150193 BLAKE2B a289beceabee0bff8c25b3430803032c1192c470bd9b3ff188cd117dd60b58102ea070c7baa65bd3d5b05dc9ed9e7460fe92812c35de33ae7bed0bee1cf2cf28 SHA512 028c5935290a1e11520928b71024c29b0db437a6737c5f63d0a58dab3d855834b0ce2895fd86f6b5166cc25fe5a87845136fe3d6cf05df333cfbe5713cbd5f50
+EBUILD supercat-0.5.5-r2.ebuild 478 BLAKE2B 5944b293ea0da4be37e53f01cb352573a6026a03bef2558b8a14d8e3c85e59298b4b2f2c4dcf39b9d2d849d4c885b3d94a462f7fe8a293179d5bc5763dc1cbde SHA512 a5c8abbc831998d555379a71cf79d4bc1f7d799905daaacf64a6646c636ec37936a704b0875181ecf0683352585bb125f6179e70561d3327ac06cef9a0555973
+EBUILD supercat-0.5.6.ebuild 482 BLAKE2B 58d2c3fabba32a82499f12243daca474011cd1939dbbb78176d333f27cf23f708305cc78e96a3b5f8dc92e90eaa44c5203b50781ff6a3cb7af956d4ec2b83e2a SHA512 7835d5ccb1faf3705051f16772bb602f1b2716496ad2574cdf5e6fec00988b33c473925fb0380495e308113cf88578140a15c425fa9b13b73f4fcd3f27dabb81
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/supercat/metadata.xml b/app-misc/supercat/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/supercat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/supercat/supercat-0.5.5-r2.ebuild b/app-misc/supercat/supercat-0.5.5-r2.ebuild
new file mode 100644
index 000000000000..815957d6c770
--- /dev/null
+++ b/app-misc/supercat/supercat-0.5.5-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A text file colorizer using powerful regular expressions"
+HOMEPAGE="http://supercat.nosredna.net"
+SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+src_configure() {
+ econf --with-system-directory="${EPREFIX}/etc/supercat"
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/supercat/supercat-0.5.6.ebuild b/app-misc/supercat/supercat-0.5.6.ebuild
new file mode 100644
index 000000000000..1b91c5494e3d
--- /dev/null
+++ b/app-misc/supercat/supercat-0.5.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A text file colorizer using powerful regular expressions"
+HOMEPAGE="http://supercat.nosredna.net"
+SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+src_configure() {
+ econf --with-system-directory="${EPREFIX}/etc/supercat"
+}
+
+src_install() {
+ default
+}
diff --git a/app-misc/symlinks-1.4-r3 b/app-misc/symlinks-1.4-r3
deleted file mode 100644
index 5a740c07865d..000000000000
--- a/app-misc/symlinks-1.4-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Scans for and fixes broken or messy symlinks
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/linux/utils/file/
-IUSE=static
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=symlinks
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/linux/utils/file/symlinks-1.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4605cdcd43b038a841dd70f3782234dc
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
new file mode 100644
index 000000000000..1004be903bea
--- /dev/null
+++ b/app-misc/symlinks/Manifest
@@ -0,0 +1,3 @@
+DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
+EBUILD symlinks-1.4-r3.ebuild 830 BLAKE2B fb15c53e718c86e997ba8a793ef7183fea52e409b37afa5f3753cbe55c48d16ae504d6ee5ab0e20ab17167ded808cc94883046cdc618a03cfc929f745d28a161 SHA512 5350e9cac341906ae71e710fd1e588395f2c267dfcefe772a161ec07e512341837fc8a583d667c3ebc785695a41cb2abe497cbb6352a2d8dc622273469dd6602
+MISC metadata.xml 631 BLAKE2B 426a6a4bb3909963d06f6e33a29a5944dc436f9951d77ba4e63f322b70d74243f317f3fd4fdfe35ee0d767f16448473177b2fa22edb8746f35786bfc988ff217 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d
diff --git a/app-misc/symlinks/metadata.xml b/app-misc/symlinks/metadata.xml
new file mode 100644
index 000000000000..7cb1facbb28b
--- /dev/null
+++ b/app-misc/symlinks/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Symlinks scans directories for symbolic links and lists them on stdout.
+ Each link is prefixed with a classification of relative, absolute,
+ dangling, messy, lengthy or other_fs. Symlinks can also convert
+ absolute links (within the same filesystem) to relative links and can
+ delete messy and dangling links.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
new file mode 100644
index 000000000000..30d018d3bce6
--- /dev/null
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="Scans for and fixes broken or messy symlinks"
+HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
+SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
+
+LICENSE="symlinks"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="static"
+
+DOCS=( symlinks.lsm )
+
+src_prepare() {
+ default
+ # could be useful if being used to repair
+ # symlinks that are preventing shared libraries from
+ # functioning.
+ use static && append-flags -static
+ append-lfs-flags
+ sed 's:-O2::g' -i Makefile || die
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.8"
+}
diff --git a/app-misc/tails-installer-4.4.11 b/app-misc/tails-installer-4.4.11
deleted file mode 100644
index 8399b963738a..000000000000
--- a/app-misc/tails-installer-4.4.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/python-distutils-extra[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4
-DESCRIPTION=A graphical tool to install or upgrade Tails on a USB stick from an ISO image
-EAPI=6
-HOMEPAGE=https://tails.boum.org https://git.tails.boum.org/liveusb-creator
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/p7zip dev-libs/glib:2 dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/gptfdisk sys-auth/polkit sys-boot/syslinux sys-fs/dosfstools sys-fs/mtools sys-fs/udisks:2[introspection] virtual/cdrtools x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://deb.tails.boum.org/pool/main/t/tails-installer/tails-installer_4.4.11+dfsg.orig.tar.gz -> tails-installer-4.4.11.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05afcbe58537c0775216e8750a17b6d8
diff --git a/app-misc/tails-installer-4.4.8 b/app-misc/tails-installer-4.4.8
deleted file mode 100644
index 4611c800cd8f..000000000000
--- a/app-misc/tails-installer-4.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/python-distutils-extra[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4
-DESCRIPTION=A graphical tool to install or upgrade Tails on a USB stick from an ISO image
-EAPI=6
-HOMEPAGE=https://tails.boum.org https://git.tails.boum.org/liveusb-creator
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/p7zip dev-libs/glib:2 dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/gptfdisk sys-auth/polkit sys-boot/syslinux sys-fs/dosfstools sys-fs/mtools sys-fs/udisks:2[introspection] virtual/cdrtools x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://deb.tails.boum.org/pool/main/t/tails-installer/tails-installer_4.4.8+dfsg.orig.tar.gz -> tails-installer-4.4.8.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f96660eb3bfcbac91f7824a8c8850230
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
new file mode 100644
index 000000000000..ae788a344553
--- /dev/null
+++ b/app-misc/tails-installer/Manifest
@@ -0,0 +1,7 @@
+AUX fix-desktop-file.patch 1046 BLAKE2B c27059fdd3baf37ecab603c1f96d70927c967909a360371c8da0cf0bc34c78c5425a9e64af4582ec0b3de5b2a5328cb3d4248f999ddc662ce8370bec6377c4bc SHA512 9c51d36b6b97e7fd52aaacc8bae9b6dc16785c249eddc01cfa1ba3bd76b5badfd1b60e53c8735d6d206753e19d7ac48e7405d2bf69300c08391b94a0ca173dc0
+AUX sgdisk.patch 1138 BLAKE2B 1dcbc23924f592a619336827fa5c4bd21fb37f52070bbd44b08ec41c3dae8c8d09a322f2aeae9e0e67a2dce435cb9ddee7729d9e83e31fe3f06513f35f1ba934 SHA512 971e9b89acd7d175e7b6e44d3c31f7541721936e5cb7c08ba196b257170e841fb95965bbdfaffb2a9cf49f43e3ab05cde29136376b497ff3ba9741735c1cbc35
+DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
+DIST tails-installer-4.4.8.tar.gz 332532 BLAKE2B 5c597f38e8cfd690b56e1a08d98567278bcb12eb72cb292c02b77d497c8fc4925f5829efdbb3351fc5a30296d9138a07f2dc8077ada2e32bf7b04dff2f31193e SHA512 3a15d31d54ae17c12c1ba8346782f26678fbabcdd99582a5b43c75f520001ec01e5cc09b1832d0f7d346852f9eb30114135c92caff8690281469f35f23806a12
+EBUILD tails-installer-4.4.11.ebuild 1158 BLAKE2B 50a17a692c89d7ef4281b4d5523143027265dc7691b751013ff64df045a5b73366dcc39fcc4f05f3fa50b2129afd3210637c21ba63a2e38629e72878a1c906d6 SHA512 bb52088ac9b0a26824b894e85f13258710b6e4643c8cf3e6945aaa26973a7a65b3684713e251c83bccd77dbd66f1f5a23c655ac7368e50e8a55229fc4991b262
+EBUILD tails-installer-4.4.8.ebuild 1160 BLAKE2B 3eb26826d2ac9201bec0e8137effa1e3eff9e8f2b2d79a32f7c928768bfe51125181fb224e5c5e684717dcc0852f2705289d248bfc59da318cb833abade1fb12 SHA512 a8a7bcea7e1ffad14b6f11eb11024a3cbc3204043689cf8928201dd011bbd9d38a956914c16619c87c6a7126e2792269ccd4b951a672f3b79eede598e0b1600a
+MISC metadata.xml 398 BLAKE2B 89d09e8e687f1b78c7b57002ac5033c4f39e22b82b856487f31db3e7e5a2bc1786f416970e0f35c95bdabc3b8025326a4f85618b6891f14bcfd7881ac016e8d0 SHA512 6871f9133b0f24777a9046d0a5d51f2191a0b36bf1532d6e2d560df1e786940da997ec0cdfe59b45236e5650c907a2e7f1ebc4e7949de3dbea373db60edf3767
diff --git a/app-misc/tails-installer/files/fix-desktop-file.patch b/app-misc/tails-installer/files/fix-desktop-file.patch
new file mode 100644
index 000000000000..ef6b5880d445
--- /dev/null
+++ b/app-misc/tails-installer/files/fix-desktop-file.patch
@@ -0,0 +1,28 @@
+diff --git a/data/tails-installer-launcher.desktop b/data/tails-installer-launcher.desktop
+index b8a3f81..c7c5b2a 100644
+--- a/data/tails-installer-launcher.desktop
++++ b/data/tails-installer-launcher.desktop
+@@ -6,8 +6,8 @@ Name[sv]=Tails installerare
+ Comment=Install, clone, upgrade Tails
+ Comment[fr]=Installer, cloner, mettre à jour Tails
+ Comment[sv]=Installera, klona, uppgradera Tails
+-Icon=tails-installer.svg
++Icon=tails-installer
+ Exec=tails-installer-launcher
+ Terminal=false
+-Categories=System;Tails;
++Categories=System;
+ Keywords=Tails;Install;Upgrade;Update;Copy;Clone;Installer;USB;Installation;Anonymity;Tor;Anonymous;SD;Amnesic;Amnesia;
+diff --git a/data/tails-installer.desktop b/data/tails-installer.desktop
+index 7d7fd2c..a79b57a 100644
+--- a/data/tails-installer.desktop
++++ b/data/tails-installer.desktop
+@@ -2,7 +2,7 @@
+ Type=Application
+ Name=Tails Installer
+ Comment=Write operating system images to a USB device
+-Icon=tails-installer.svg
++Icon=tails-installer
+ Exec=tails-installer
+ Terminal=false
+ Categories=System;
diff --git a/app-misc/tails-installer/files/sgdisk.patch b/app-misc/tails-installer/files/sgdisk.patch
new file mode 100644
index 000000000000..21339b23ae6c
--- /dev/null
+++ b/app-misc/tails-installer/files/sgdisk.patch
@@ -0,0 +1,29 @@
+--- /tails_installer/creator.py
++++ /tails_installer/creator.py
+@@ -220,7 +220,7 @@
+ raise NotImplementedError
+
+ def update_system_partition_properties(self):
+- cmd = ( [ '/sbin/sgdisk' ]
++ cmd = ( [ '/usr/sbin/sgdisk' ]
+ + [ '--typecode=1:%s' % ESP_GUID ]
+ + [ self.drive['parent'] ])
+ self.popen(cmd, shell=False)
+@@ -235,7 +235,7 @@
+ if not device:
+ device = self.drive['device']
+
+- proc = self.popen(['/sbin/sgdisk', '--print', device], shell=False, passive=True)
++ proc = self.popen(['/usr/sbin/sgdisk', '--print', device], shell=False, passive=True)
+ if proc.returncode:
+ return False
+ return True
+@@ -249,7 +249,7 @@
+ # understand... while we want to make it do this reset
+ # precisely to fix that unreadable partition table issue.
+ # Chicken'n'egg, right.
+- self.popen(['/sbin/sgdisk', '--zap-all', device],
++ self.popen(['/usr/sbin/sgdisk', '--zap-all', device],
+ shell=False, passive=True)
+
+ def switch_drive_to_system_partition(self):
diff --git a/app-misc/tails-installer/metadata.xml b/app-misc/tails-installer/metadata.xml
new file mode 100644
index 000000000000..5d675ba1a31b
--- /dev/null
+++ b/app-misc/tails-installer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>wizardedit@gentoo.org</email>
+ <name>Austin English</name>
+ </maintainer>
+ <longdescription>
+ Tails Installer is a graphical tool to install or upgrade Tails on a USB stick from an ISO image.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/tails-installer/tails-installer-4.4.11.ebuild b/app-misc/tails-installer/tails-installer-4.4.11.ebuild
new file mode 100644
index 000000000000..e67daaeac16f
--- /dev/null
+++ b/app-misc/tails-installer/tails-installer-4.4.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
+HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
+SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
+
+DEPEND="${PYTHON_DEPS}
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
+ app-arch/p7zip
+ dev-libs/glib:2
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ dev-python/urlgrabber[${PYTHON_USEDEP}]
+ sys-apps/gptfdisk
+ sys-auth/polkit
+ sys-boot/syslinux
+ sys-fs/dosfstools
+ sys-fs/mtools
+ sys-fs/udisks:2[introspection]
+ virtual/cdrtools
+ x11-libs/gtk+:3[introspection]"
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/tails-installer/tails-installer-4.4.8.ebuild b/app-misc/tails-installer/tails-installer-4.4.8.ebuild
new file mode 100644
index 000000000000..95febfb28b2b
--- /dev/null
+++ b/app-misc/tails-installer/tails-installer-4.4.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
+HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
+SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
+
+DEPEND="${PYTHON_DEPS}
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
+ app-arch/p7zip
+ dev-libs/glib:2
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ dev-python/urlgrabber[${PYTHON_USEDEP}]
+ sys-apps/gptfdisk
+ sys-auth/polkit
+ sys-boot/syslinux
+ sys-fs/dosfstools
+ sys-fs/mtools
+ sys-fs/udisks:2[introspection]
+ virtual/cdrtools
+ x11-libs/gtk+:3[introspection]"
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/task-2.5.1-r1 b/app-misc/task-2.5.1-r1
deleted file mode 100644
index 97995d7bedd1..000000000000
--- a/app-misc/task-2.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline:0 sync? ( net-libs/gnutls:0= ) elibc_glibc? ( sys-apps/util-linux ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Taskwarrior is a command-line todo list manager
-EAPI=6
-HOMEPAGE=https://taskwarrior.org/
-IUSE=+sync vim-syntax zsh-completion
-KEYWORDS=amd64 ~arm x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=sys-libs/readline:0 sync? ( net-libs/gnutls:0= ) elibc_glibc? ( sys-apps/util-linux )
-SLOT=0
-SRC_URI=https://taskwarrior.org/download/task-2.5.1.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06d49e3201230a2b0be2fd52db9e7367
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
new file mode 100644
index 000000000000..9a4a0942dca1
--- /dev/null
+++ b/app-misc/task/Manifest
@@ -0,0 +1,4 @@
+AUX 0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch 660 BLAKE2B 56250a860b836d64b190049912123ebc5a06202ad25a6aa974a420b856f472d7aa5364cee96539c204e2c09c88a9f6e59cc5606aacf5b8c29655310340233a49 SHA512 6af9226a73280ca1c5f3f95d11b9c8f10ad4d847df9401643a8294645031cd3141916e4b00a188e25795f4a51f9f55e4caf2ba3280d5c9bd89f44a89411389a5
+DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6b0834f875b1b02b38dbfde5e961122fdde00dc5ff29b56226a5ce0f805bd1be8a8194c9e185ab80ad6d6c2 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10
+EBUILD task-2.5.1-r1.ebuild 1264 BLAKE2B 9ce29b7eb39bd74479dbd22f7169072047f6f84610dadfffff0cc092ec28764be925760ef0707c37b91294bbeb9bda530fde908837e704ed9d2132a338d32508 SHA512 1cb91bbc30012a9c292a4d3b3c40aa6ef80ff7580b2fd86d9e12e7a1b49b414c0fa9de60c1ac6b55067b5f258977517b7f103488d2923cd4e96d787dc074d150
+MISC metadata.xml 315 BLAKE2B cf3abc1d5632a494070db454bb5a1da2d35d68b7519127ef471a207b10313bd5a717ce38c60616ec7a72bfa39fcb7980b3d39a2ba97e1053233f4c0674a92b15 SHA512 509043e7fa47b91c7e0041325e34d2f96cadddae179e0852420f53ce40f2dcf3a6ee959b31de3a1169277dfedea79c27b07aa14ba5daa774b1cdc13b55edf9b5
diff --git a/app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch b/app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch
new file mode 100644
index 000000000000..6ff8ac22e21a
--- /dev/null
+++ b/app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch
@@ -0,0 +1,23 @@
+From d025f3deb6349f56a7fc49551e819cfe13f97917 Mon Sep 17 00:00:00 2001
+From: Paul Beckingham <paul@beckingham.net>
+Date: Wed, 31 Aug 2016 17:48:45 -0400
+Subject: [PATCH] TW-1778: Unicode strings are truncated in task description
+
+- Thanks to Andrew, bjonnh, OKOMPer, Vladimir.
+---
+diff --git a/src/text.cpp b/src/text.cpp
+index f5e3496b..bc8353f7 100644
+--- a/src/text.cpp
++++ b/src/text.cpp
+@@ -248,7 +248,7 @@ bool extractLine (
+ // Premature EOL.
+ if (character == '\n')
+ {
+- line = text.substr (offset, line_length);
++ line = text.substr (offset, prior_cursor - offset);
+ offset = cursor;
+ return true;
+ }
+--
+2.11.0
+
diff --git a/app-misc/task/metadata.xml b/app-misc/task/metadata.xml
new file mode 100644
index 000000000000..bba57a4435e2
--- /dev/null
+++ b/app-misc/task/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <use>
+ <flag name="sync">Enable "task sync" support</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/task/task-2.5.1-r1.ebuild b/app-misc/task/task-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..25ea234d42b0
--- /dev/null
+++ b/app-misc/task/task-2.5.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
+IUSE="+sync vim-syntax zsh-completion"
+
+DEPEND="sys-libs/readline:0
+ sync? ( net-libs/gnutls:0= )
+ elibc_glibc? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # don't automatically install scripts
+ sed -i '/scripts/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_SYNC=$(usex sync)
+ -DTASK_DOCDIR=share/doc/${PF}
+ -DTASK_RCDIR=share/${PN}/rc
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ newbashcomp scripts/bash/task.sh task
+
+ if use vim-syntax; then
+ rm scripts/vim/README || die
+ insinto /usr/share/vim/vimfiles
+ doins -r scripts/vim/*
+ fi
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins scripts/zsh/*
+ fi
+
+ exeinto "/usr/share/${PN}/scripts"
+ doexe scripts/add-ons/*
+}
diff --git a/app-misc/taskd-1.1.0-r1 b/app-misc/taskd-1.1.0-r1
deleted file mode 100644
index cfcf6dd14554..000000000000
--- a/app-misc/taskd-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-libs/readline:0 net-libs/gnutls sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=the server part of Taskwarrior, a command-line todo list manager
-EAPI=5
-HOMEPAGE=https://taskwarrior.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/readline:0 net-libs/gnutls sys-apps/util-linux
-SLOT=0
-SRC_URI=https://taskwarrior.org/download/taskd-1.1.0.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=121ba9b6b5db1ad010fdf413ebbadfba
diff --git a/app-misc/taskd/Manifest b/app-misc/taskd/Manifest
new file mode 100644
index 000000000000..07ee0c04329a
--- /dev/null
+++ b/app-misc/taskd/Manifest
@@ -0,0 +1,7 @@
+AUX config 392 BLAKE2B 4d31dd097cae0d784698cbbb2100310730bda647a139116ac237dcd765df6234651e5f833e1c58ff869d2780b5a79f4f45cd442a001577fd944e8d4253d1faa2 SHA512 00d21faa5063f7024885c63c455310b8f06738a03ff0b0c348f2b65166e2253d46148ee3faa2cc2269f5dd1178fc9be5f2566cccf9b2c3545ed311dff840b804
+AUX taskd.confd 27 BLAKE2B e60babd7477263d12aebb306607a6edea2cc4675d265b4c7a95928e686d95b1d655487e4c052bcc0b0bcb4bbc468e4b061740b2fc2cedfb093b666f3e5a1b93f SHA512 e05ff87aae4eb81d7d8c69396653abeef4d35be6804c7547440888078b33b77ed00371c10429453d59bf1583fb53e42e8f7b4120bac84aa9a29b046190aae44d
+AUX taskd.initd 397 BLAKE2B 537dab2a50eb56f9830a83164b51f221a6ad219009c4b1bd176631b198d000017acf31b8c162c1ad6ef217e10d93da9a78413a7deb40e569676eff195176ba5b SHA512 92663323b44d5cb36d86ab2b33c761214926c24d5ba3e84c4495e3e6158e1ff4fe603c2f7e79070c02e88ba90904f9b701bc75feedd2a9ce5f1b9982192e1d3f
+AUX taskd.logrotate 114 BLAKE2B ec9fe02930b299dc309771b1b2b696a6e6e93722760ccc56227d24d7fc38bfbc6ee37a7cdd17fc042df98aff8584a765e1833f4e24520cd99564b70a2bd81f06 SHA512 4d8c3c12dc203cc6c9f27ad6882934a2786504a5b6ef7dfedd43deb61faaa4ceff452adfc93e2ed0074dd2545a90867c2ff85bca73adf9d1c858adfc76649fc4
+DIST taskd-1.1.0.tar.gz 120115 BLAKE2B 1baabcd29afb2c44c5da19f6cb926546e9beb5716ea1a04d247e62c02b4a4c5bc4bf3347e32e0e417f3b5edf1b78f58d306f1d584340c344a13fd29cdd39dcc7 SHA512 df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa
+EBUILD taskd-1.1.0-r1.ebuild 1867 BLAKE2B aad3c71c48ef79d17ab77e86cd98b1190f4b76b5baf6b5e238bdcf9d87a48686a10c2caab9adc3c7f7dc1a6354657e9a3e67e0ff97911bbd6749e2e7a228db36 SHA512 6a0a307c4401622b8c65e13a0a243e8d1d4e302afc70851d6040529f9ac21ef841897501321d989a8b93441dcbf08a56121fb11c14dab0ead0759220ffcf332a
+MISC metadata.xml 246 BLAKE2B bf870c5ee1af2f88418b8fac2cdf8adc852cebf6ee3d22f009ac4dda5307a5ff26d419f6d53c161d1096334a37b924d3188e51a299d3a4903ab842c68ee648b6 SHA512 cf3bffaa344cc0785ce4b3a18c5cef7b508e943de589d67485df46802f0c9c1b9bd6d51b7197fc84431180f82b8affae22175ae0bfe7616b57f6874a861f6698
diff --git a/app-misc/taskd/files/config b/app-misc/taskd/files/config
new file mode 100644
index 000000000000..51a8cddf7992
--- /dev/null
+++ b/app-misc/taskd/files/config
@@ -0,0 +1,17 @@
+confirmation=1
+extensions=/usr/libexec/taskd
+ip.log=on
+log=/var/log/taskd/taskd.log
+pid.file=/run/taskd.pid
+queue.size=10
+request.limit=1048576
+root=/var/lib/taskd
+server=localhost:53589
+trust=strict
+verbose=1
+# TLS config:
+#ciphers=
+#ca.cert=/etc/taskd/tls/ca.pem
+#server.cert=/etc/taskd/tls/server.crt.pem
+#server.crl=/etc/taskd/tls/server.crl.pem
+#server.key=/etc/taskd/tls/server.key.pem
diff --git a/app-misc/taskd/files/taskd.confd b/app-misc/taskd/files/taskd.confd
new file mode 100644
index 000000000000..aadbc6e8f741
--- /dev/null
+++ b/app-misc/taskd/files/taskd.confd
@@ -0,0 +1 @@
+TASKDDATA="/var/lib/taskd"
diff --git a/app-misc/taskd/files/taskd.initd b/app-misc/taskd/files/taskd.initd
new file mode 100644
index 000000000000..504ad104cb29
--- /dev/null
+++ b/app-misc/taskd/files/taskd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+need="net localmount"
+command="/usr/bin/taskd"
+command_args="server --data ${TASKDDATA:-/var/lib/taskd}"
+pidfile="/run/taskd.pid"
+start_stop_daemon_args="--user taskd:taskd"
+command_background=1
+extra_started_commands="reload"
+
+reload() {
+ kill -HUP "$(cat $pidfile)"
+}
diff --git a/app-misc/taskd/files/taskd.logrotate b/app-misc/taskd/files/taskd.logrotate
new file mode 100644
index 000000000000..cfce919c114d
--- /dev/null
+++ b/app-misc/taskd/files/taskd.logrotate
@@ -0,0 +1,8 @@
+/var/log/taskd/taskd.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ delaycompress
+ copytruncate
+}
diff --git a/app-misc/taskd/metadata.xml b/app-misc/taskd/metadata.xml
new file mode 100644
index 000000000000..2c0b1557c797
--- /dev/null
+++ b/app-misc/taskd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/taskd/taskd-1.1.0-r1.ebuild b/app-misc/taskd/taskd-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..fbf8edd6dd4d
--- /dev/null
+++ b/app-misc/taskd/taskd-1.1.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils systemd user
+
+DESCRIPTION="the server part of Taskwarrior, a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/readline:0
+ net-libs/gnutls
+ sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ mycmakeargs=(
+ -DTASKD_DOCDIR=share/doc/${PF}
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ systemd_dounit "${S}"/scripts/systemd/taskd.service
+
+ insinto /usr/share/${PN}/pki
+ doins pki/*
+
+ insinto /usr/share/${PN}/mon
+ doins mon/*
+
+ newinitd "${FILESDIR}"/taskd.initd taskd
+ newconfd "${FILESDIR}"/taskd.confd taskd
+
+ grep ^TASKDDATA= "${FILESDIR}"/taskd.confd > 90taskd
+ doenvd 90taskd
+
+ dodir /etc/taskd
+ keepdir /usr/libexec/taskd
+
+ diropts -m 0750
+ dodir /var/lib/taskd
+ keepdir /var/log/taskd
+
+ diropts -m 0700
+ keepdir /var/lib/taskd/orgs /etc/taskd/tls
+
+ insopts -m0600
+ insinto /etc/taskd
+ doins "${FILESDIR}"/config
+
+ dosym ../../../etc/taskd/config /var/lib/taskd/config
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/taskd.logrotate taskd
+}
+
+pkg_setup() {
+ enewgroup taskd
+ enewuser taskd -1 /bin/bash /var/lib/taskd taskd
+}
+
+pkg_postinst() {
+ chown taskd:taskd /var/lib/taskd{,/orgs} /var/log/taskd /etc/taskd/{config,tls}
+
+ einfo ""
+ einfo "For configuration see 'man taskdrc' and edit /etc/taskd/config"
+ einfo "You will need to configure certificates first in order to use taskd"
+ einfo ""
+ ewarn ""
+ ewarn "Do not use 'taskd init' as this will replace the config file and set"
+ ewarn "default but unsuitable paths"
+ ewarn ""
+ ewarn "In order to manage taskd via 'taskd' either relogin or run 'source /etc/profile'"
+ ewarn ""
+}
diff --git a/app-misc/tdfsb-0.0.10 b/app-misc/tdfsb-0.0.10
deleted file mode 100644
index 3dc4a26c0b4f..000000000000
--- a/app-misc/tdfsb-0.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/smpeg media-libs/sdl-image media-libs/freeglut virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
-DESCRIPTION=SDL based graphical file browser
-EAPI=4
-HOMEPAGE=http://www.determinate.net/webdata/seg/tdfsb.html
-KEYWORDS=alpha amd64 ppc -sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/smpeg media-libs/sdl-image media-libs/freeglut virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.determinate.net/webdata/data/tdfsb-0.0.10.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3fbb5c2c744684e96ad1961b472d5464
diff --git a/app-misc/tdfsb-0.0.10-r1 b/app-misc/tdfsb-0.0.10-r1
deleted file mode 100644
index 17967c9d8dd4..000000000000
--- a/app-misc/tdfsb-0.0.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
-DESCRIPTION=SDL based graphical file browser
-EAPI=5
-HOMEPAGE=http://www.determinate.net/webdata/seg/tdfsb.html
-KEYWORDS=alpha amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.determinate.net/webdata/data/tdfsb-0.0.10.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53d3286a246f58ca2a40ab85806e7fbf
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
new file mode 100644
index 000000000000..2bd47b08171d
--- /dev/null
+++ b/app-misc/tdfsb/Manifest
@@ -0,0 +1,7 @@
+AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683fb58c04fe3bf6f4fb6fd02ed98b7c8d2e4f5a768366bfec66a9d77b9575a7ce08fb68c526d69e922b758191a06c7dc SHA512 cc6daffb087df7cd75986de69240e19a762db8a8c42621d1b8b5fe869bdabe676e3748b2387212362eb2854d7f7dd74bd085671372d453eecaa8cd38f91962d0
+AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
+AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
+DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
+EBUILD tdfsb-0.0.10-r1.ebuild 914 BLAKE2B 025a6278b386ccd288c72ea6a95c06958efd21fb01ae3076ef64319f9cd3f61c7337293944716d9f465b89f19192151c81147dc915a08e9f11bcef2e287c7723 SHA512 2307b4ea3739fdaad830787048da9f0d3eca7e5885486dfa18145038f42359fe4ef0bff574abadb9cb62a14991d2500181cf43401d8bfefc0811adbe6e0323a4
+EBUILD tdfsb-0.0.10.ebuild 869 BLAKE2B 82a15208cf84421bbdb2cf277a1bfd405bbe3a60525f781ab752e2fdc1268dc71963f93bcdfa4f093a1410b9cb1ab8505189b50f8424669451ab70f453600e26 SHA512 55c1b31d3fb421f2f5ddf6655a209eaa37bb5b201c3190bf4cbf7021d15891c8e3e32d14cf4e3d1c618092dcdce586c398abaa2a159cebb7a88ca1f5b9064da1
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
new file mode 100644
index 000000000000..c84cc4d5f17d
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
@@ -0,0 +1,23 @@
+diff --git a/compile.sh b/compile.sh
+index fcd6583..2480364 100755
+--- a/compile.sh
++++ b/compile.sh
+@@ -26,15 +26,15 @@ ARGS2=$($SDL_CONFIG --cflags);
+ if uname -s | grep -i -c "LINUX" > /dev/null; then
+ echo "GNU/Linux detected.";
+ echo "compiling...";
+- gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++ gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
+ elif uname -s | grep -i -c "BEOS" > /dev/null; then
+ echo "BeOS detected.";
+ echo "compiling...";
+- gcc $ARGS1 $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -lSDL_image -lGL -lglut -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++ gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg;
+ elif uname -s | grep -i -c "BSD" > /dev/null; then
+ echo "BSD detected.";
+ echo "compiling...";
+- gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++ gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
+ else
+ echo "Unknown OS. If you are running Linux, BeOS or";
+ echo "FreeBSD please send me the output of 'uname -s'."
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch
new file mode 100644
index 000000000000..e7f24d89ebf4
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch
@@ -0,0 +1,28 @@
+diff --git a/compile.sh b/compile.sh
+index 2480364..96e9bd2 100755
+--- a/compile.sh
++++ b/compile.sh
+@@ -23,18 +23,20 @@ echo "Using $SDL_CONFIG.";
+ ARGS1=$($SDL_CONFIG --libs);
+ ARGS2=$($SDL_CONFIG --cflags);
+
++set -x
++
+ if uname -s | grep -i -c "LINUX" > /dev/null; then
+ echo "GNU/Linux detected.";
+ echo "compiling...";
+- gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++ gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg || exit 1
+ elif uname -s | grep -i -c "BEOS" > /dev/null; then
+ echo "BeOS detected.";
+ echo "compiling...";
+- gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg;
++ gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg || exit 1
+ elif uname -s | grep -i -c "BSD" > /dev/null; then
+ echo "BSD detected.";
+ echo "compiling...";
+- gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++ gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg || exit 1
+ else
+ echo "Unknown OS. If you are running Linux, BeOS or";
+ echo "FreeBSD please send me the output of 'uname -s'."
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
new file mode 100644
index 000000000000..55fcc1ba1df3
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
@@ -0,0 +1,26 @@
+diff --git a/tdfsb.c b/tdfsb.c
+index 5f6b233..a1af5a1 100644
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2436,7 +2436,7 @@ int speckey(int key)
+ if(TDFSB_CSE_FLAG)
+ snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING,fullpath);
+ else
+- snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING);
++ snprintf(TDFSB_CES_TEMP,4096,"%s", TDFSB_CUSTOM_EXECUTE_STRING);
+ }
+ system(TDFSB_CES_TEMP);
+ printf("EXECUTE COMMAND: %s\n",TDFSB_CES_TEMP);
+@@ -2732,9 +2732,9 @@ int keyboard (unsigned char key)
+
+ else if (key==TDFSB_KC_HELP)
+ { TDFSB_SHOW_HELP = 1-TDFSB_SHOW_HELP;
+- if (TDFSB_SHOW_HELP) { printf("\n=======================================\n");
+- printf(help_str);
+- printf("=======================================\n\n");
++ if (TDFSB_SHOW_HELP) { printf("%s", "\n=======================================\n");
++ printf("%s", help_str);
++ printf("%s", "=======================================\n\n");
+ }
+ }
+
diff --git a/app-misc/tdfsb/metadata.xml b/app-misc/tdfsb/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-misc/tdfsb/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
new file mode 100644
index 000000000000..6810b67461f3
--- /dev/null
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
+IUSE=""
+
+DEPEND="media-libs/freeglut
+ media-libs/sdl-image
+ media-libs/smpeg
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-asneeded.patch \
+ "${FILESDIR}"/${P}-debugging.patch \
+ "${FILESDIR}"/${P}-format-security.patch
+
+ sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
+ -e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+ ./compile.sh || die "compile failed"
+}
+
+src_install() {
+ dobin tdfsb
+ dodoc ChangeLog README
+}
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
new file mode 100644
index 000000000000..235f23ad33de
--- /dev/null
+++ b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc -sparc x86"
+IUSE=""
+
+DEPEND="media-libs/smpeg
+ media-libs/sdl-image
+ media-libs/freeglut
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-asneeded.patch \
+ "${FILESDIR}"/${P}-debugging.patch
+
+ sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
+ -e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+ ./compile.sh || die "compile failed"
+}
+
+src_install() {
+ dobin tdfsb
+ dodoc ChangeLog README
+}
diff --git a/app-misc/tdl-1.5.2-r2 b/app-misc/tdl-1.5.2-r2
deleted file mode 100644
index 628a8714ac07..000000000000
--- a/app-misc/tdl-1.5.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline sys-apps/sed sys-apps/texinfo doc? ( virtual/texi2dvi )
-DESCRIPTION=Command line To Do List manager
-EAPI=4
-HOMEPAGE=http://www.rc0.org.uk/tdl/
-IUSE=doc readline
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz https://dev.gentoo.org/~jlec/distfiles/tdl-screenshot.png.tar
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4885f950054e1516591cb729145455fc
diff --git a/app-misc/tdl/Manifest b/app-misc/tdl/Manifest
new file mode 100644
index 000000000000..5d18c067b65d
--- /dev/null
+++ b/app-misc/tdl/Manifest
@@ -0,0 +1,8 @@
+AUX 1.5.2-ldflags.patch 350 BLAKE2B 147ecde0a506852a3540c825143478cd7b741d3846afa7e58fe01cb389aaa1b9bd186916cd714b5d24a01a6ce5cc714e0bab53d95fee563a2916d8d87a149df8 SHA512 a3bb6f75a56d350755edf4cbb7a36fbe3da2e87fb8744a5597f9909cfe9e03b9ea4a50d70d9ca0cb2c480c11597701fbf9866d5eb7e726617005679c41ec5e9d
+AUX tdl-1.5.2-list.c.patch 1272 BLAKE2B 4d65bd0c6336d459b388f2375468871df6e7761e5be90aba3d059ec7991b4e41907b3c1089f3ada9416cb944a74b90d15c8435866d622e1117b4084df9facba8 SHA512 a66d0728f06d386827dd1232e3c290c9e749689cb368b9240638cde86c5ef1ae5e9ce5923a6b7dbba5e04c30ded2174c1c16e24ca6a943754cd178098a732400
+AUX tdl-1.5.2-main.c.patch 4967 BLAKE2B f609c3a44996ddf4bac91f65e28e3dbad4600284a8ffe0f249a2e58289ee98d0f6fb4533599d66b8a7019e52a235f6366ace8ef12e6882606849f9fccbd3e927 SHA512 b7036f2b4292263fcde59c6cb46a869dec92fe314f4d3a5d4f2f5411adb945ec5493e82a142372bca933d67c423c4deff333b297a1dc2481d993de1789faaeb2
+AUX tdl-1.5.2-man.patch 11004 BLAKE2B 849601edce8452c3ca590b6b10f211ee81355adc121ff878fee165758bde10cc58b4a72a0bb71855b58093ff45a21d51761e24563b50c8be88ebb61d9d1a50eb SHA512 fef2ca8f8c6db0b61037ad10269fe185f2d5cb1ffdee0560acdba61be87d71d2195471412d26a5c6e7766332d9a13bf95774b0374de14b6df7b4a97ad27e8d32
+DIST tdl-1.5.2.tar.gz 66057 BLAKE2B cc2d5581126d995098b5dc3032c97213614acaea3b984a507a824da2ba4d3be9afff954722f29acf0b9bd26db42ada22d67fc9110496961c2cb3104d9b4b7ece SHA512 8c07a5b6a5434bb567a2d68b6e0215bbfa7be3f7176ae1042652ac18684289117230af25d8d161fcf1ba27d9b740fd3fcd43c3213467b533de64390686481fe0
+DIST tdl-screenshot.png.tar 20480 BLAKE2B ce9284501ba1550179e1c3da54399a802aae3c0fb23b9a1ea25a1adb0f5c0404fe7694a360435913bb91cc1977d71561050ec0fe4e1681db775cdc7ec5fa11b7 SHA512 caca9793626b320ded4c7f16425b98e4bfde9ab0ca3c1bea60ecc8aaa8db080ab6fc3c474aef4d56e394b6415ec1162671329912aa22452dbd5dc72b50c7c8f6
+EBUILD tdl-1.5.2-r2.ebuild 1513 BLAKE2B bc883123e1df051229cfe479f95f46faeb498dbb4aa8c501dfd901a247a0797dd80c528603ed518202e3eb8fab926f0ba825af69f77c6123eb77fcee8318242a SHA512 40c6116b132441e21d62bccb997b1e140879df1981684aaba097d8b3373b4f933d94b89e52b3dc2d864a1b08193b09811437bad3077e228a600d0275fb752794
+MISC metadata.xml 507 BLAKE2B 9887ee368ca6f3409ee7da8a1fe98b0b6bac98f3b6949a1a263c9a8966b95d73c33c2b496f98732824e08d17af45b12a12916707e6932be88a947e9ca46d416e SHA512 ce0e36e0dc95b3c050f17e33220bb85c07946127337ae766b7c3af2d9d0891187bb9ab73d8cb01f91bad4f061620d19a403f3af85c801e3194f0a9dc6a0b6ce2
diff --git a/app-misc/tdl/files/1.5.2-ldflags.patch b/app-misc/tdl/files/1.5.2-ldflags.patch
new file mode 100644
index 000000000000..d807fdf02246
--- /dev/null
+++ b/app-misc/tdl/files/1.5.2-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 46b05ca..eb9b656 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,7 +52,7 @@ OBJ = main.o io.o add.o done.o remove.o move.o list.o \
+ all : tdl
+
+ tdl : $(OBJ)
+- $(CC) $(CFLAGS) -o tdl $(OBJ) $(LIB_READLINE)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o tdl $(OBJ) $(LIB_READLINE)
+
+ %.o : %.c
+ $(CC) $(CFLAGS) -c $<
diff --git a/app-misc/tdl/files/tdl-1.5.2-list.c.patch b/app-misc/tdl/files/tdl-1.5.2-list.c.patch
new file mode 100644
index 000000000000..d2cc39bd49c1
--- /dev/null
+++ b/app-misc/tdl/files/tdl-1.5.2-list.c.patch
@@ -0,0 +1,34 @@
+--- tdl-1.5.2.orig/list.c
++++ tdl-1.5.2/list.c
+@@ -75,14 +75,15 @@
+ static void print_timestamp(int timestamp, char *leader, int indent, int monochrome)/*{{{*/
+ {
+ char buffer[32];
+- time_t now;
++ time_t now, timestamp2;
+ long diff, days_ago, days_ahead;
+
+ now = time(NULL);
+ diff = now - timestamp;
+ days_ago = (diff + ((diff > 0) ? 43200 : -43200)) / 86400;
++ timestamp2 = (time_t) timestamp;
+ strftime(buffer, sizeof(buffer), "%a %d %b %Y %H:%M",
+- localtime((time_t *)&timestamp));
++ localtime(&timestamp2));
+ do_indent(indent+2);
+ if (days_ago < 0) {
+ days_ahead = - days_ago;
+@@ -524,6 +525,13 @@
+ * Otherwise, use the priority from the specified node, _except_ when
+ * that is higher than normal, in which case use normal. */
+ prio_to_use = (prio_set) ? prio : ((node_prio > prio) ? prio : node_prio);
++ /* if listing up-to-some-depth (option -N) and also
++ * beginning at some top-level (option NNN) then depth must be
++ * decremented by 1
++ * see: http://bugs.debian.org/364083 */
++ if (options.depth > 0) {
++ options.depth--;
++ }
+ list_chain(&n->kids, INDENT_TAB, 0, &options, index_buffer, prio_to_use, now, hits);
+ }
+ } else if ((y[0] == '-') && (y[1] == '-')) {
diff --git a/app-misc/tdl/files/tdl-1.5.2-main.c.patch b/app-misc/tdl/files/tdl-1.5.2-main.c.patch
new file mode 100644
index 000000000000..c195a1e5cb7c
--- /dev/null
+++ b/app-misc/tdl/files/tdl-1.5.2-main.c.patch
@@ -0,0 +1,178 @@
+--- tdl-1.5.2.orig/main.c
++++ tdl-1.5.2/main.c
+@@ -80,7 +80,7 @@
+ return;
+ }
+ /*}}}*/
+-static volatile void unlock_and_exit(int code)/*{{{*/
++static void unlock_and_exit(int code)/*{{{*/
+ {
+ unlock_database();
+ exit(code);
+@@ -237,22 +237,91 @@
+
+ }
+ /*}}}*/
+-static void rename_database(char *path)/*{{{*/
++static mode_t get_mode(const char *path); /* prototype */
++/*}}}*/
++static int copy_file_contents(char *pathsrc, char *pathdest) {
++ int src, dest;
++ ssize_t rdsize = 1;
++ char buf[4096];
++
++ src = open(pathsrc, O_RDONLY);
++ if (src == -1) {
++ perror("warning, couldn't open database");
++ return 0;
++ }
++ dest = open(pathdest, O_WRONLY | O_CREAT, get_mode(pathsrc));
++ if (dest == -1) {
++ perror("warning, couldn't open/create backup database");
++ close(src);
++ return 0;
++ }
++ if (ftruncate(dest,0) != 0) {
++ perror("warning, couldn't truncate backup database");
++ close(src);
++ close(dest);
++ return 0;
++ }
++ lseek(src,0,SEEK_SET);
++ lseek(dest,0,SEEK_SET);
++ while (rdsize > 0) {
++ rdsize = read(src, buf, 4096);
++ if (rdsize == -1) {
++ perror("warning, error reading database");
++ close(src);
++ close(dest);
++ return 0;
++ }
++ if (rdsize > 0) {
++ if (write(dest, buf, rdsize) != rdsize) {
++ perror("warning, error writing to backup database");
++ close(src);
++ close(dest);
++ return 0;
++ }
++ }
++ }
++ close(src);
++ close(dest);
++ return 1;
++}
++/*}}}*/
++static int path_is_symlink(char *path) {
++ int i;
++ struct stat s;
++ i = lstat(path, &s);
++ if ((i == 0) && (S_ISLNK(s.st_mode))) {
++ return 1; /* is a symlink */
++ }
++ return 0; /* not a symlink */
++}
++/*}}}*/
++static int rename_database(char *path)/*{{{*/
+ {
+- int len;
++ /* the rename_database function returns 1 if database or/and
++ * database backup file are symlinks; otherwise returns 0 */
++ int len, symlinks;
+ char *pathbak;
+-
++
+ len = strlen(path);
+ pathbak = new_array(char, len + 5);
+ strcpy(pathbak, path);
+ strcat(pathbak, ".bak");
+- if (rename(path, pathbak) < 0) {
+- if (is_noisy) {
+- perror("warning, couldn't save backup database:");
++
++ symlinks = path_is_symlink(path) | path_is_symlink(pathbak);
++
++ if (symlinks) {
++ if (access(path,F_OK) == 0) {
++ copy_file_contents(path, pathbak);
++ }
++ } else {
++ if (rename(path, pathbak) < 0) {
++ if (is_noisy) {
++ perror("warning, couldn't save backup database:");
++ }
+ }
+ }
+ free(pathbak);
+- return;
++ return symlinks;
+ }
+ /*}}}*/
+ static char *executable_name(char *argv0)/*{{{*/
+@@ -315,7 +384,7 @@
+ /*}}}*/
+ static void save_database(char *path)/*{{{*/
+ {
+- FILE *out;
++ FILE *out = NULL;
+ int out_fd;
+ mode_t database_mode;
+ if (is_loaded && currently_dirty) {
+@@ -324,20 +393,34 @@
+ /* The next line only used to happen if the command wasn't 'create'.
+ * However, it should quietly fail for create, where the existing database
+ * doesn't exist */
+- rename_database(path);
+-
+- /* Open database this way so that the permissions from the existing
+- database can be duplicated onto the new one in way free of race
+- conditions. */
+- out_fd = open(path, O_WRONLY | O_CREAT | O_EXCL, database_mode);
+- if (out_fd < 0) {
+- fprintf(stderr, "Could not open new database %s for writing : %s\n",
+- path, strerror(errno));
+- unlock_and_exit(1);
++ if (rename_database(path) == 0) {
++ /* database is a regular file */
++ /* Open database this way so that the permissions from the existing
++ database can be duplicated onto the new one in way free of race
++ conditions. */
++ out_fd = open(path, O_WRONLY | O_CREAT | O_EXCL, database_mode);
++ if (out_fd < 0) {
++ fprintf(stderr, "Could not open new database %s for writing : %s\n",
++ path, strerror(errno));
++ unlock_and_exit(1);
++ }
+ } else {
+- /* Normal case */
+- out = fdopen(out_fd, "wb");
++ /* database and/or backup database are symlinks */
++ /* we should truncate existing file and write its contents */
++ out_fd = open(path, O_WRONLY | O_CREAT, database_mode);
++ if (out_fd < 0) {
++ fprintf(stderr, "Could not open database %s for writing : %s\n",
++ path, strerror(errno));
++ unlock_and_exit(1);
++ } else {
++ /* Normal case */
++ if (ftruncate(out_fd, 0) != 0) {
++ perror("warning, couldn't truncate database:");
++ unlock_and_exit(1);
++ }
++ }
+ }
++ out = fdopen(out_fd, "wb");
+ if (!out) {
+ fprintf(stderr, "Cannot open database %s for writing\n", path);
+ unlock_and_exit(1);
+@@ -728,6 +811,11 @@
+
+ if (!is_loaded && cmds[index].load_db) {
+ load_database(current_database_path);
++ if (is_interactive && (!is_loaded)) {
++ fprintf(stderr, "error: could not open database. please create a "
++ "database with 'tdl create' before using this tdl command\n");
++ unlock_and_exit(-1);
++ }
+ }
+
+ pp = is_tdl ? (p + 1) : p;
diff --git a/app-misc/tdl/files/tdl-1.5.2-man.patch b/app-misc/tdl/files/tdl-1.5.2-man.patch
new file mode 100644
index 000000000000..955201a2fe2f
--- /dev/null
+++ b/app-misc/tdl/files/tdl-1.5.2-man.patch
@@ -0,0 +1,507 @@
+--- tdl-1.5.2.orig/tdl.1
++++ tdl-1.5.2/tdl.1
+@@ -2,25 +2,25 @@
+ .SH NAME
+ tdl \- To do list manager
+ .SH SYNOPSIS
+-tdl [-q]
++tdl [\-q]
+ .br
+-tdl [-q] add|edit|defer|log
++tdl [\-q] add|edit|defer|log
+ .br
+-tdl [-q] list|done|undo|report
++tdl [\-q] list|done|undo|report
+ .br
+-tdl [-q] remove|above|below|into|clone|copyto
++tdl [\-q] remove|above|below|into|clone|copyto
+ .br
+-tdl [-q] postpone|ignore|open
++tdl [\-q] postpone|ignore|open
+ .br
+-tdl [-q] which|version|help
++tdl [\-q] which|version|help
+ .br
+-tdla [-q]
++tdla [\-q]
+ .br
+-tdll [-q]
++tdll [\-q]
+ .br
+-tdld [-q]
++tdld [\-q]
+ .br
+-tdlg [-q]
++tdlg [\-q]
+
+ .SH DESCRIPTION
+ A program for managing a to-do list.
+@@ -68,9 +68,9 @@
+ modified database back to the disk. Only use it if you want to discard
+ all changes made in this tdl run.
+
+-.pp
++.PP
+ All forms may take
+-.I -q
++.I \-q
+ as the first command line argument. Currently, this suppresses the warning
+ message if no existing database can be found. The intended use is for using
+ .B tdll
+@@ -104,7 +104,7 @@
+ appear as the last children of the parent node afterwards.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl add
+ .I [@datespec]
+@@ -156,7 +156,7 @@
+ environment is set, in which case this specifies the path to use).
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl below
+ .I index_to_insert_below
+@@ -173,7 +173,7 @@
+ appear as the first children of the parent node afterwards.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl clone
+ .I index_to_clone ...
+@@ -185,7 +185,7 @@
+ to change its text.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl copyto
+ .I new_parent_index
+@@ -197,7 +197,7 @@
+ children of an existing entry, rather than making them new top level entries.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl create
+ .PP
+@@ -217,7 +217,7 @@
+ TDL_DATABASE.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl defer
+ .I [@datespec]
+@@ -233,7 +233,7 @@
+ .P
+ which defers entries 1, 2.1 and all its children, and 5 until the following Friday.
+ To list deferred entries, use
+-.I list -p
++.I list \-p
+ , to defer entries indefinitely, see
+ .I postpone
+ command.
+@@ -242,7 +242,7 @@
+ command.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl done
+ .I @datespec
+@@ -278,7 +278,7 @@
+ section later in this page.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl edit
+ .I index_to_change
+@@ -294,7 +294,7 @@
+ command.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B exit
+ .PP
+@@ -308,7 +308,7 @@
+ command, which loses all updates made during the current tdl run.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl export
+ .I filename
+@@ -322,14 +322,14 @@
+ the original database.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl help
+ .PP
+ This command displays a summary of use of each of the commands.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl ignore
+ .I index_to_ignore ...
+@@ -353,7 +353,7 @@
+ it
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl import
+ .I filename
+@@ -367,7 +367,7 @@
+ wanted to merge their entries to form one combo database.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl into
+ .I new_parent_index
+@@ -381,23 +381,23 @@
+ argument has ".0" appended to it.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl list
+-.I [-v]
+-.I [-a]
+-.I [-p]
+-.I [-m]
+-.I [-1...9]
++.I [\-v]
++.I [\-a]
++.I [\-p]
++.I [\-m]
++.I [\-1...9]
+ .I [<min-priority>]
+ .I [<parent_index>|<search_conditions>...]
+ .br
+ .B tdll
+-.I [-v]
+-.I [-a]
+-.I [-p]
+-.I [-m]
+-.I [-1...9]
++.I [\-v]
++.I [\-a]
++.I [\-p]
++.I [\-m]
++.I [\-1...9]
+ .I [<min-priority>]
+ .I [<parent_index>|<search_conditions...]
+ .PP
+@@ -410,13 +410,13 @@
+ .B done
+ and which don't have start times deferred into the future are shown. If you
+ want to display all entries, include the
+-.B -a
++.B \-a
+ option (which means 'all'). If you want to display the dates and times when
+ the entries were added and/or done, include the
+-.B -v
++.B \-v
+ option (which means 'verbose').
+ The
+-.B -p
++.B \-p
+ option stands for postponed. It means that tasks which are 'deferred' or 'postponed'
+ are shown as well as open tasks.
+ .PP
+@@ -431,14 +431,14 @@
+ top node of each part of the database you want to show. So if your database
+ contains entries with indices 1, 2, 2.1, 2.2, 2.2.1, 3 and 4, the command
+ .PP
+-tdl list -a 2
++tdl list \-a 2
+ .PP
+ will show all entries 2, 2.1, 2.2 and 2.2.1, whether or not they are completed.
+ .PP
+ Also by default, all entries in the database, at any depth, will be shown. If
+ you only wish to show 'top-level' entries, for example, you can use
+ .PP
+-tdl list -1
++tdl list \-1
+ .PP
+ This lists level-1 entries. Any level-1 entry with hidden child entries
+ underneath it will show a summary of how many such children there are. For
+@@ -454,11 +454,11 @@
+ the normal 'negative index' method can't be used to specify an entry a certain
+ distance from the end of the list. If you want to do this, use a syntax like
+ .PP
+-tdl list -- -1
++tdl list \-\- \-1
+ .PP
+ to show the last index in the array, or
+ .PP
+-tdl list -2 -- -3 -2 -1
++tdl list \-2 \-\- \-3 \-2 \-1
+ .PP
+ to show level-1 and level-2 entries within the last 3 level-1 entries in the
+ list.
+@@ -489,7 +489,7 @@
+ approximate matches with keys up to 31 characters.
+ .PP
+ By default, the listing is produced with colour highlighting. The
+-.B -m
++.B \-m
+ option can be used to produce a monochrome listing instead. Alternatively, the
+ .B TDL_LIST_MONOCHROME
+ enviroment variable can be set (to any value) to achieve the same effect.
+@@ -512,7 +512,7 @@
+ .TE
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl log
+ .br
+@@ -530,7 +530,7 @@
+ command.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B narrow
+ .I new_root_index
+@@ -562,7 +562,7 @@
+ wouldn't make much sense).
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl open
+ .I index_to_reopen[...] ...
+@@ -573,7 +573,7 @@
+ current time.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl postpone
+ .I index_to_postpone[...] ...
+@@ -586,7 +586,7 @@
+ command.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl pri
+ .I new_priority
+@@ -602,7 +602,7 @@
+ command.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl purge
+ .I since_epoch
+@@ -626,7 +626,7 @@
+ descendents. The default is to purge the entire database.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B quit
+ .PP
+@@ -642,7 +642,7 @@
+ The main use for the quit command would be to avoid damaging the database if a serious error had been made.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl remove
+ .I index_to_remove ...
+@@ -659,7 +659,7 @@
+ descendents. This provides a quick way to remove a whole sub-tree of tasks.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl report
+ .I start_time
+@@ -688,12 +688,12 @@
+ will list all tasks completed between 2 and 1 weeks ago.
+ .PP
+ Where a child entry has been completed in the reporting period, but its parent
+-has not been completed, the parent text in the report will be surrounded by
+-'[[' and ']]'. To give one example, this will happen if the parent has other
++has not been completed, the parent text in the report will be surrounded by '[['
++and ']]'. To give one example, this will happen if the parent has other
+ child entries that haven't been completed yet.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B revert
+ .PP
+@@ -706,7 +706,7 @@
+ The revert command does not take any arguments.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B save
+ .PP
+@@ -728,7 +728,7 @@
+ The save command does not take any arguments.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl undo
+ .I index_of_entry_to_undo ...
+@@ -742,7 +742,7 @@
+ descendents. This provides a quick way to re-open a whole sub-tree of tasks.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl usage
+ .PP
+@@ -751,21 +751,21 @@
+ (q.v.)
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl version
+ .PP
+ Show the version number of the software.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B tdl which
+ .PP
+ Show the filename of the database that tdl accesses in the current context.
+ .P
+ .ce 1
+---ooOOoo--
++\-\-ooOOoo-\-
+ .PP
+ .B widen
+ .I n_level
+@@ -831,30 +831,30 @@
+ .TS
+ tab(&);
+ l l.
+--1h & exactly 1 hour ago
+--2d & exactly 2 days ago
++\-1h & exactly 1 hour ago
++\-2d & exactly 2 days ago
+ +1w & exactly 1 week in the future
+ +1m & exactly 1 month (30 days) in the future
+ +2y & exactly 2 years in the future
+--1d-0815 & 08:15am yesterday
++\-1d-0815 & 08:15am yesterday
+ +1d-08 & 8am tomorrow
+ +1w-08 & 8am on the same day as today next week
+ +6h-08 & 8am on the day containing the time 6 hours ahead of now
+-\.-08 & 8am today
+-\.-20 & 8pm today
++\.\-08 & 8am today
++\.\-20 & 8pm today
+ 20011020 & absolute : 12 noon on 20th October 2001
+ 011020 & absolute : 12 noon on 20th October 2001 (current century)
+ 1020 & absolute : 12 noon on 20th October 2001 (current century and year)
+ 20 & absolute : 12 noon on 20th October 2001 (current century, year and month)
+-20011020-081500 & absolute : 08:15am on 20th October 2001
+-20011020-0815 & absolute : 08:15am on 20th October 2001 (seconds=0)
+-20011020-08 & absolute : 08:00am on 20th October 2001 (minutes=seconds=0)
+-011020-08 & absolute : 08:00am on 20th October 2001 (minutes=seconds=0, current century)
++20011020\-081500 & absolute : 08:15am on 20th October 2001
++20011020\-0815 & absolute : 08:15am on 20th October 2001 (seconds=0)
++20011020\-08 & absolute : 08:00am on 20th October 2001 (minutes=seconds=0)
++011020\-08 & absolute : 08:00am on 20th October 2001 (minutes=seconds=0, current century)
+ etc & (see below)
+--sun & 12 noon on the previous Sunday
++\-sun & 12 noon on the previous Sunday
+ +sat & 12 noon on the following Saturday
+ +sat-08 & 8am on the following Saturday
+--tue-0815 & 08:15am on the previous Tuesday
++\-tue-0815 & 08:15am on the previous Tuesday
+ etc & (see below)
+ .TE
+ .PP
+@@ -876,7 +876,7 @@
+ of the more uses of this mode are rather far-fetched.
+ .PP
+ For the weekday and relative formats, the sign is actually optional. The
+-default sign (implying past (-) or future (+)) will then be assumed depending on
++default sign (implying past (\-) or future (+)) will then be assumed depending on
+ the command as shown below:
+
+ .PP
+@@ -886,9 +886,9 @@
+ Command & Default & Reason
+ _
+ add & + & Add entries with deferred start times
+-done & - & Entries have been completed at some time in the past
+-report & - & Reporting on earlier completed tasks not future ones
+-purge & - & Tasks won't be completed in the future, so no need to purge future ones
++done & \- & Entries have been completed at some time in the past
++report & \- & Reporting on earlier completed tasks not future ones
++purge & \- & Tasks won't be completed in the future, so no need to purge future ones
+ .TE
+
+ .SH HOMEPAGE
+@@ -943,16 +943,7 @@
+ .IP
+ cd project1
+ .br
+-ln -s ../project2/.tdldb .
++ln \-s ../project2/.tdldb .
+
+ .SH BUGS
+ Please report them to the author.
+-
+-.SH SEE ALSO
+-The full documentation for tdl is maintained as a Texinfo manual. If the info and tdl
+-programs are properly installed at your site, the command
+-.IP
+-info tdl
+-.PP
+-should give you access to the complete manual.
+-
diff --git a/app-misc/tdl/metadata.xml b/app-misc/tdl/metadata.xml
new file mode 100644
index 000000000000..fbad613d45e5
--- /dev/null
+++ b/app-misc/tdl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ tdl is a command-line application for managing a list of outstanding
+ tasks that you have to do. It can organise tasks in a hierarchy, produce
+ weekly reports of completed tasks and so on.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/tdl/tdl-1.5.2-r2.ebuild b/app-misc/tdl/tdl-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..3b105616d7c0
--- /dev/null
+++ b/app-misc/tdl/tdl-1.5.2-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Command line To Do List manager"
+HOMEPAGE="http://www.rc0.org.uk/tdl/"
+SRC_URI="
+ http://www.rpcurnow.force9.co.uk/tdl/${P}.tar.gz
+ https://dev.gentoo.org/~jlec/distfiles/${PN}-screenshot.png.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc readline"
+
+RDEPEND="
+ sys-libs/ncurses
+ sys-libs/readline"
+DEPEND="${RDEPEND}
+ sys-apps/sed
+ sys-apps/texinfo
+ doc? ( virtual/texi2dvi )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PV}-ldflags.patch \
+ "${FILESDIR}"/${P}-list.c.patch \
+ "${FILESDIR}"/${P}-main.c.patch \
+ "${FILESDIR}"/${P}-man.patch
+
+ tc-export CC
+}
+
+src_configure() {
+ local myconf="--prefix=${EPREFIX}/usr"
+
+ if ! use readline; then
+ myconf="${myconf} --without-readline"
+
+ sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' "${S}"/Makefile.in || die
+ fi
+ sed -i 's#-ltermcap#-lncurses#g' "${S}"/configure || die
+
+ # XXX: do not replace with econf.
+ "${S}"/configure ${myconf} || die "configure failed, sorry!"
+}
+
+src_compile() {
+ emake all tdl.info tdl.html tdl.txt
+ use doc && emake tdl.dvi tdl.ps tdl.pdf
+}
+
+src_install() {
+ local i
+
+ dodoc README NEWS tdl.txt "${WORKDIR}"/screenshot.png
+ doinfo tdl.info
+ dohtml tdl.html
+
+ dobin tdl
+ doman tdl.1
+
+ for i in tdl{a,l,d,g}
+ do
+ dosym tdl /usr/bin/${i}
+ dosym tdl.1 /usr/share/man/man1/${i}.1
+ done
+
+ if use doc; then
+ dodoc tdl.dvi tdl.ps tdl.pdf
+ fi
+}
diff --git a/app-misc/tek-1.3.0 b/app-misc/tek-1.3.0
deleted file mode 100644
index b4dc8b399fee..000000000000
--- a/app-misc/tek-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/wxGTK:3.0=[X] virtual/libusb:1 virtual/udev app-editors/vim-core virtual/pkgconfig
-DESCRIPTION=GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard
-EAPI=6
-HOMEPAGE=https://trulyergonomic.com/ https://github.com/m-ou-se/tek
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved GPL-3+
-RDEPEND=x11-libs/wxGTK:3.0=[X] virtual/libusb:1 virtual/udev
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/m-ou-se/tek/archive/v1.3.0.tar.gz -> tek-1.3.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets 04e063b0eff26daaea83d859dd9d6e05
-_md5_=1bc1e7a9846ac66cf79d57e2ab9fc0ff
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest
new file mode 100644
index 000000000000..5cb1db432cf9
--- /dev/null
+++ b/app-misc/tek/Manifest
@@ -0,0 +1,3 @@
+DIST tek-1.3.0.tar.gz 99399 BLAKE2B 191fec7992ea4b79aed5833012cb22ac3ad399eced53e74467139aa05e2dfda08af220b35cb191f5f1bf706186a8460f3d80196599f43654d5de05e36b5df84b SHA512 20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd
+EBUILD tek-1.3.0.ebuild 935 BLAKE2B f3e3402447b1b3fb451389018fd16497bfe2eb52be781eace5bf5fe907fb86370283e23fd16572b56fa1eb8798ac46172c7c8de7f359901bf3a3f12b8864af1d SHA512 24f9cc5e5b8a8859a9f9a1de0fbd10c7deab048b40e2723fe65e0279f0c3eea345621a3bd386ceee482b5d9a5fc41dd293da5ba12378a73b903ea31c0d0ea13e
+MISC metadata.xml 330 BLAKE2B 98389927d53498647e22bc7460337219fee86fec8d06edc73edcf17a8a67d6b1c62bad2ef2fb3eec3d037b3960f5da0356ae6b81b5c525334c3216b7049c4190 SHA512 6d46988601ab6a6284211d488d55a6b56e63442424b4abc5910320cdfac5c1b5c8f050090878a7f3680de4acbecbd8e67f3195c9f6734139123c32fcebc103ee
diff --git a/app-misc/tek/metadata.xml b/app-misc/tek/metadata.xml
new file mode 100644
index 000000000000..b51edd0de5da
--- /dev/null
+++ b/app-misc/tek/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>aidecoe@gentoo.org</email>
+ <name>Amadeusz Żołnowski</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">m-ou-se/tek</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
new file mode 100644
index 000000000000..69421b1eaec1
--- /dev/null
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0
+
+inherit udev wxwidgets
+
+DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
+HOMEPAGE="https://trulyergonomic.com/ https://github.com/m-ou-se/tek"
+SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="all-rights-reserved GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}=[X]
+ virtual/libusb:1
+ virtual/udev"
+DEPEND="${RDEPEND}
+ app-editors/vim-core"
+
+src_prepare() {
+ default
+ setup-wxwidgets
+ sed -r \
+ -e '/LIN_STRIP/d' \
+ -e 's/LIN_CXX/CXX/g' \
+ -e 's/CXX=/CXX\?=/' \
+ -e 's/CXXFLAGS=(.*)/CXXFLAGS:=\1 $(CXXFLAGS)/' \
+ -i "${S}"/Makefile || die
+}
+
+src_install() {
+ newbin tek.lin tek
+ udev_newrules linux-udev-rules 40-tek.rules
+ einstalldocs
+}
+
+pkg_postinst() {
+ udev_reload
+}
diff --git a/app-misc/terminal-colors-2.2 b/app-misc/terminal-colors-2.2
deleted file mode 100644
index 0c1e4ee42af2..000000000000
--- a/app-misc/terminal-colors-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A tool to display color charts for 8, 16, 88, and 256 color terminals
-EAPI=6
-HOMEPAGE=http://zhar.net/projects/shell/terminal-colors
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/distfiles/terminal-colors-2.2.bz2
-_eclasses_=multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=83f100cd4c7882924d03a518f357adcd
diff --git a/app-misc/terminal-colors/Manifest b/app-misc/terminal-colors/Manifest
new file mode 100644
index 000000000000..94835bbd8cf7
--- /dev/null
+++ b/app-misc/terminal-colors/Manifest
@@ -0,0 +1,3 @@
+DIST terminal-colors-2.2.bz2 4826 BLAKE2B 8a0e2918dd4fbeade61a683fd965b947fc0acdd01be028ddce3c42831e563d97e2bbc260a9781ee0d7cb1d104a9be06f3a5bc78d9725b4cb100c172b0f4994d4 SHA512 ddd1a3cf6786011372ca83b3fe86a88c863a1fa1b5cf8450cabd364a3330847145cf4bd5eb8d50baa7c26b17c392eb0f629007dbb765b36b3904d0783216ce36
+EBUILD terminal-colors-2.2.ebuild 612 BLAKE2B d7a5aa0ed7022c5a6837d094d8f0636f4284146348bbf2770d3a9dbfb5ec878dc42dbc226f1f13c376bd0c863ca263c01966db387be047aba51f62c3765f3578 SHA512 0cc0c3e3c917faa590cf1979169854df4f6cb89b6796b225d40d7ff602c78f0b075ce6e54c900f35603a95a9f3e6771c7bc7a3264407f4756404b1607440e11c
+MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-misc/terminal-colors/metadata.xml b/app-misc/terminal-colors/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/app-misc/terminal-colors/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/terminal-colors/terminal-colors-2.2.ebuild b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
new file mode 100644
index 000000000000..3d6b6e1b99fd
--- /dev/null
+++ b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-r1
+
+DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
+HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
+SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+S=${WORKDIR}
+
+src_install() {
+ python_foreach_impl python_newscript ${P} ${PN}
+}
diff --git a/app-misc/timestamp-1.1-r1 b/app-misc/timestamp-1.1-r1
deleted file mode 100644
index 5cdbafe30737..000000000000
--- a/app-misc/timestamp-1.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!sys-apps/moreutils
-DESCRIPTION=A text filtering pipe that marks each line with a timestamp
-EAPI=6
-HOMEPAGE=http://math.smsu.edu/~erik/software.php?id=95
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=!sys-apps/moreutils
-SLOT=0
-SRC_URI=http://math.smsu.edu/~erik/files/timestamp-1.1.tar.gz
-_md5_=2bc9f0fc6411266d584d1e0368ed09d8
diff --git a/app-misc/timestamp/Manifest b/app-misc/timestamp/Manifest
new file mode 100644
index 000000000000..c3384d5d8a87
--- /dev/null
+++ b/app-misc/timestamp/Manifest
@@ -0,0 +1,3 @@
+DIST timestamp-1.1.tar.gz 61578 BLAKE2B dd33dc27a7353f25ffaeb01cc2fb6af25288e03021b097783fa2a659bd8abe0fd3cff1e9dad7858f16529253e1573bec7f1883ab6f37a462f51374bae591f3dc SHA512 38952f40938e45e178e310dfc3b974c1974485614f4da7617790642f8594a4583e97ec056cb2f4fe2761d86d04595bc0d387312803bf95add929d48863fd6b9b
+EBUILD timestamp-1.1-r1.ebuild 484 BLAKE2B 1076e54410064f16fc82ada6daf163229ca03645ae1ae82d70a7974a3afdc00cf52349e2659d7e39a4d15eadc322d3c678c8615cc5704f9deccc3714eb52a1bf SHA512 94eebdcfca66816fb907fdbb10755283178495270e2b6e867a9800a15d03826d7ac1e6d127f5c66a233d5bcdde9fa8e95d1702d24a5043fbc94b33e2e7f7bf05
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/timestamp/metadata.xml b/app-misc/timestamp/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/timestamp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/timestamp/timestamp-1.1-r1.ebuild b/app-misc/timestamp/timestamp-1.1-r1.ebuild
new file mode 100644
index 000000000000..b0cd6f1496f3
--- /dev/null
+++ b/app-misc/timestamp/timestamp-1.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A text filtering pipe that marks each line with a timestamp"
+HOMEPAGE="http://math.smsu.edu/~erik/software.php?id=95"
+SRC_URI="http://math.smsu.edu/~erik/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="!sys-apps/moreutils"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog )
+
+src_install() {
+ emake DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/app-misc/timew-1.0.0 b/app-misc/timew-1.0.0
deleted file mode 100644
index b6b22808e213..000000000000
--- a/app-misc/timew-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Tracks your time from the command line, and generates reports
-EAPI=6
-HOMEPAGE=https://taskwarrior.org/news/news.20160821.html
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://taskwarrior.org/download/timew-1.0.0.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32fd2f8647747571f98f826ab4b949a8
diff --git a/app-misc/timew-1.1.1 b/app-misc/timew-1.1.1
deleted file mode 100644
index e1c3ee1d9735..000000000000
--- a/app-misc/timew-1.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Tracks your time from the command line, and generates reports
-EAPI=6
-HOMEPAGE=https://taskwarrior.org/news/news.20160821.html
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://taskwarrior.org/download/timew-1.1.1.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c49fedf27184405d2c7aa382eb238e8
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
new file mode 100644
index 000000000000..dd2c0779b365
--- /dev/null
+++ b/app-misc/timew/Manifest
@@ -0,0 +1,5 @@
+DIST timew-1.0.0.tar.gz 140539 BLAKE2B 486c1e99a587597a040e3fb45c15602e56798b5a13ce3f47fb8d73b3995ee270ef2601e49dc4efe3023d1179a111b55c50c92a3feece87d9bad6a26123dc9008 SHA512 0539ff93b2375c154d126c39aa84f21b57b62f51c220c80b2e323a4d6aefd2eda6f87c04112e096222102b019ee3683a78b9ee9d6fbf6736d4a34c529f6152f5
+DIST timew-1.1.1.tar.gz 166484 BLAKE2B 64b8560220550299c76207873184252b1100d146ac745e46f38790a90294c59e5da95852836433f1d5213a2f1272063a534c20b2963a88fbaa1bcb888e40b70b SHA512 d262227d6dc99994599252c9fc55d32e4caac9d5ff1f223b8637005ed9f4f7fa238bd5cb7392c8e42a468f6246a7afad9b6fdb02af636e53d3bd813cfc3ee110
+EBUILD timew-1.0.0.ebuild 512 BLAKE2B 6050789317fa16dd7c5e9ff926cefef8778c2a5d06ff2e8fdce163ed8c1de33faab0a8fb77c80bdd223b4ec2602b7efc4139da62fbf5db832adbd3d97a72d85c SHA512 0029cd62f73134e30e313929dc41bb499a081054715f7ec16234b83affffedda3e958abcc0b417267002dcb80bcc35000b91c07bc66e2d4b015bb14be3cca890
+EBUILD timew-1.1.1.ebuild 512 BLAKE2B 15a91014bb2bea1ae3fa306129df3cff014be92a528db86c6ad2361a7de9153c95c2184001799c6204e7297accd6105d3a5cc7ae298c3d376151772f35805dc6 SHA512 d6b4128865a695302bab3bd14e2fafae27e437c3362663dff545485e61642b06c1aa4703aa4361de6c0878df1cee852595b8411ec4e04aff75d853798975ed9f
+MISC metadata.xml 254 BLAKE2B a18499b4ce0a448cf0321b4c94f7e3d3499ba025e4a7a66fa6a67342470f163f988161a80c183443a7ad222894594ffa2a5a8452cbf39ac890b660ceb319019f SHA512 b3850bc7c75c11c1cd29ad3560299a281a67d1c39cfb052c1964422209446da77036d4072ad192a2bd9c793aab2f0878426ff9a3ac723ea18553a0564271225d
diff --git a/app-misc/timew/metadata.xml b/app-misc/timew/metadata.xml
new file mode 100644
index 000000000000..674f5ad944f3
--- /dev/null
+++ b/app-misc/timew/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>aidecoe@gentoo.org</email>
+ <name>Amadeusz Żołnowski</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/timew/timew-1.0.0.ebuild b/app-misc/timew/timew-1.0.0.ebuild
new file mode 100644
index 000000000000..b17148ed009a
--- /dev/null
+++ b/app-misc/timew/timew-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tracks your time from the command line, and generates reports"
+HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ mycmakeargs=(
+ -DTIMEW_DOCDIR=share/doc/${PF}
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-misc/timew/timew-1.1.1.ebuild b/app-misc/timew/timew-1.1.1.ebuild
new file mode 100644
index 000000000000..751d9bdd68d9
--- /dev/null
+++ b/app-misc/timew/timew-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tracks your time from the command line, and generates reports"
+HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ mycmakeargs=(
+ -DTIMEW_DOCDIR=share/doc/${PF}
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-misc/tkpasman-2.2b b/app-misc/tkpasman-2.2b
deleted file mode 100644
index 14d7094627ee..000000000000
--- a/app-misc/tkpasman-2.2b
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0=
-DESCRIPTION=A useful and reliable personal password manager, written in Tcl/Tk
-EAPI=5
-HOMEPAGE=http://www.xs4all.nl/~wbsoft/linux/tkpasman.html
-IUSE=ssl
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~wbsoft/linux/projects/TkPasMan-2.2b.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f1fcc5e9cff68cfc0c267bef253d80b
diff --git a/app-misc/tkpasman/Manifest b/app-misc/tkpasman/Manifest
new file mode 100644
index 000000000000..0f1cceb0d414
--- /dev/null
+++ b/app-misc/tkpasman/Manifest
@@ -0,0 +1,4 @@
+AUX tkpasman-2.2a-gentoo.patch 771 BLAKE2B 3ac72ed705357db279e5584412146c8a1e8079dca474bb679df89e46ea5e144978b4e6d9d7bc4a987cc9283e1fa22e57296304e018e4ebcac225915500f4d14b SHA512 6d0fca1b86d5e3a980245510ff98979ef4f9cd85cfdee6fee37e19b83824471fbf8154768ad8921d1ea9bced218c5b2a117022907c81f1775d332530680ea260
+DIST TkPasMan-2.2b.tar.gz 31365 BLAKE2B 46588abfdc321b0b57da94b585c3bdc1ec724c8f30f6275aa428c0b5ee21b8ba486a0ac927f8062ff0ed38418933351346d4f44062b601355ee677f0ad1b3a6e SHA512 ca74ed6a5989c21b266ff4bed00963d46eb05e1a7a0822dceeae5c87bcbb7bf36a775eedf86244fa1121008a6df59fa38003e07e8cb6e4ddf98c895b61f24f12
+EBUILD tkpasman-2.2b.ebuild 784 BLAKE2B ab79f669c7e99180d4f0a505033d2ccb1c6b4b9d77f0d917b3a05fa60252e717ffeb3730401d28eb28119ef55a46a25beaaf70e2307ee775f5d92d4eee9e11a9 SHA512 6eacde9f32fd49c317705d52b21a24f936b7ff590c3648d5a456efea94a37fa70fbdb208e8f26b6efc0b507f90585c68f14a0263ec11617e36a1438b58e7c6ae
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch b/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
new file mode 100644
index 000000000000..d52d5129b7c7
--- /dev/null
+++ b/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
@@ -0,0 +1,22 @@
+--- build.sh 2005-01-01 19:18:44.290385166 +0000
++++ build.sh 2005-01-01 19:22:45.846161383 +0000
+@@ -44,8 +44,8 @@
+ #
+ # Try to find wish8.3, tclsh8.3 and openssl
+ #
+-WISH=`FIND "$WISH" "" wish8.4 wish8.3 wish`
+-TCLSH=`FIND "$TCLSH" "" tclsh8.4 tclsh8.3 tclsh`
++WISH=`FIND "$WISH" "" wish wish8.4 wish8.3`
++TCLSH=`FIND "$TCLSH" "" tclsh tclsh8.4 tclsh8.3`
+ OPENSSL=`FIND "$OPENSSL" "$OPENSSL_SEARCH_PATH" openssl ssl`
+
+ #
+@@ -88,7 +88,7 @@
+ if test "$USE_OPENSSL" = "true" -a -x "$OPENSSL"
+ then
+ echo "Found OpenSSL program: $OPENSSL"
+- ENC=`$OPENSSL list-cipher-commands|sort|egrep "^($ENC)\$"|head -1`
++ ENC=`$OPENSSL list-cipher-commands|sort|egrep "^($ENC)\$"|head -n 1`
+ if test -z "$ENC"
+ then
+ echo "Could not find a suitable encryption algorithm."
diff --git a/app-misc/tkpasman/metadata.xml b/app-misc/tkpasman/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/tkpasman/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/tkpasman/tkpasman-2.2b.ebuild b/app-misc/tkpasman/tkpasman-2.2b.ebuild
new file mode 100644
index 000000000000..d731fe173f99
--- /dev/null
+++ b/app-misc/tkpasman/tkpasman-2.2b.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_P="TkPasMan-${PV}"
+
+DESCRIPTION="A useful and reliable personal password manager, written in Tcl/Tk"
+HOMEPAGE="http://www.xs4all.nl/~wbsoft/linux/tkpasman.html"
+SRC_URI="http://www.xs4all.nl/~wbsoft/linux/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl"
+
+DEPEND="
+ >=dev-lang/tcl-8.3:0=
+ >=dev-lang/tk-8.3:0="
+RDEPEND="${DEPEND}
+ ssl? ( dev-libs/openssl )
+ "
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.2a-gentoo.patch
+
+ if use ssl; then
+ sed -i "s:^USE_OPENSSL=true:USE_OPENSSL=false:g" config || die
+ fi
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README ChangeLog TODO WARNING INSTALL
+}
diff --git a/app-misc/tmate-2.2.0-r1 b/app-misc/tmate-2.2.0-r1
deleted file mode 100644
index 031f633db8c4..000000000000
--- a/app-misc/tmate-2.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Instant terminal sharing
-EAPI=5
-HOMEPAGE=http://tmate.io/
-IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
-SLOT=0
-SRC_URI=https://github.com/tmate-io/tmate/archive/2.2.0.tar.gz -> tmate-2.2.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/tmate-2.2.0-upstream-patches-0.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efc85a06338b6af412ff496de3f4e805
diff --git a/app-misc/tmate-2.2.1 b/app-misc/tmate-2.2.1
deleted file mode 100644
index a57f25dae984..000000000000
--- a/app-misc/tmate-2.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Instant terminal sharing
-EAPI=5
-HOMEPAGE=http://tmate.io/
-IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
-SLOT=0
-SRC_URI=https://github.com/tmate-io/tmate/archive/2.2.1.tar.gz -> tmate-2.2.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b2650e377de293717d0a436fe936a6c
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
new file mode 100644
index 000000000000..415897ff69ab
--- /dev/null
+++ b/app-misc/tmate/Manifest
@@ -0,0 +1,6 @@
+DIST tmate-2.2.0-upstream-patches-0.tar.xz 6784 BLAKE2B b21a2065ba7a7832238cb6b6bbfe3e730593766a34244e139d0e357cad538a4462e68a9e884a6250fc72a10a775fa13e53054618c35804cc05ad0cc31854d9e3 SHA512 3e16e0b7988d3d1942fcac0a535d2cc8d7156d26332dc84fd21c4761afae40159282b0fbeb71cd5f6525b5a1c7a46e7813c8e6a11851592077570c1a001a73a7
+DIST tmate-2.2.0.tar.gz 610793 BLAKE2B febe2ed652e8387f65d938f09c6abbd92841a71a285035f6322bcf786aa4f80f71a0f49fc475743a8565bf4c7e434d9f503ffc6bae26d531429b1c58bc0ffbe9 SHA512 e9429833cdb8c28873d01bfc6b9a0d1241e30346ef1b3efae6763389c8444943b831283c1ea65e49c68d11936d6586186b38e0f7c14d373d9f63e841026c3338
+DIST tmate-2.2.1.tar.gz 610745 BLAKE2B 8a97d7726b528d12e14c74c07f795b18510a4b7a0068f1e1168b06e2a6856945518b3b9a35f71ba8598b8f9390d754443eca197f95f5c9c61d6160f4008ff65d SHA512 3d4ce7510cd8da39bc4fe63f2a64179846a813bb3560ca811d9e1e2a28b06d95a9033047a900d76bda069c249d7ebbe1143daa082b23212c5d32a50bf1819d2d
+EBUILD tmate-2.2.0-r1.ebuild 1192 BLAKE2B 761449c113afa1de7693e30a940eb3a9097b4a4e6c35cdf4c22f156cf7eb0c7d8b8abc7817f3c56f686ff68c4d9a1fff661eb9c3dbdadd81ec17f6a1b3063e27 SHA512 d8342c3932a874f952f6ce3cd1467261255b215059125ff8c638ed3eef806112d3051a2d2f7302dd4f8897c4c6ea48c111d5ddb2266d01db5354a34dfe6ced85
+EBUILD tmate-2.2.1.ebuild 1191 BLAKE2B f3f4e256431b130809a1085e875db05efa6a51ac173c7d5c538a8a4a5253c612b19738accbb320510de5e1e8dac46e2680965b0c8802697b0ae8e973f0f99695 SHA512 159e4e6a3d6d49253bb4c78a285c714c30d93b5753c20880195be487ab04edbd42f8abaec277e0c8f2297302696148892cc364574d0b26445aeabd291be75b24
+MISC metadata.xml 329 BLAKE2B 4b983e08fb7a5704f11c7e07e91a322258b128d5a2826fbea1f62718b83daf71552d63304df6e0995a68ce33e05bf3e276aded270a004a95a43fc8f98501744d SHA512 0097a64f483d6b8a24bfa5006f6df9dbeb697ee04152f5451111449d69d54813ff6f474e8fc91b33a2db2e0ba6ad85d25b359ef6684a74c884d2bcf16cfa9e75
diff --git a/app-misc/tmate/metadata.xml b/app-misc/tmate/metadata.xml
new file mode 100644
index 000000000000..02e9da1a1d51
--- /dev/null
+++ b/app-misc/tmate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tmate-io/tmate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/tmate/tmate-2.2.0-r1.ebuild b/app-misc/tmate/tmate-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..37f0c9a8caea
--- /dev/null
+++ b/app-misc/tmate/tmate-2.2.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit eutils autotools-utils
+
+DESCRIPTION="Instant terminal sharing"
+HOMEPAGE="http://tmate.io/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+UPSTREAM_VER=0
+[[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}"
+
+RDEPEND="
+ sys-libs/zlib[static-libs?]
+ sys-libs/libutempter[static-libs?]
+ dev-libs/openssl[static-libs?]
+ dev-libs/libevent[static-libs?]
+ dev-libs/msgpack[static-libs?]
+ >=net-libs/libssh-0.6.0[static-libs?]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply tmate Upstream patch set"
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
diff --git a/app-misc/tmate/tmate-2.2.1.ebuild b/app-misc/tmate/tmate-2.2.1.ebuild
new file mode 100644
index 000000000000..0afcb394d3f3
--- /dev/null
+++ b/app-misc/tmate/tmate-2.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit eutils autotools-utils
+
+DESCRIPTION="Instant terminal sharing"
+HOMEPAGE="http://tmate.io/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}"
+
+RDEPEND="
+ sys-libs/zlib[static-libs?]
+ sys-libs/libutempter[static-libs?]
+ dev-libs/openssl[static-libs?]
+ dev-libs/libevent[static-libs?]
+ dev-libs/msgpack[static-libs?]
+ >=net-libs/libssh-0.6.0[static-libs?]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply tmate Upstream patch set"
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
diff --git a/app-misc/tmux-2.6 b/app-misc/tmux-2.6
deleted file mode 100644
index 94f2811d2a9a..000000000000
--- a/app-misc/tmux-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Terminal multiplexer
-EAPI=6
-HOMEPAGE=https://tmux.github.io/
-IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=ISC
-RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/tmux/tmux/releases/download/2.6/tmux-2.6.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=48b21250e2ec1ab686460e71c71def1c
diff --git a/app-misc/tmux-2.7 b/app-misc/tmux-2.7
deleted file mode 100644
index 023fb10852b7..000000000000
--- a/app-misc/tmux-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Terminal multiplexer
-EAPI=6
-HOMEPAGE=https://tmux.github.io/
-IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=ISC
-RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/tmux/tmux/releases/download/2.7/tmux-2.7.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9c5c6a435744e63f7ab16b49bb47dd19
diff --git a/app-misc/tmux-9999 b/app-misc/tmux-9999
deleted file mode 100644
index 03aff00814ca..000000000000
--- a/app-misc/tmux-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Terminal multiplexer
-EAPI=6
-HOMEPAGE=https://tmux.github.io/
-IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-LICENSE=ISC
-RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8a7c57df81abd679f84948163f234bcf
diff --git a/app-misc/tmux-mem-cpu-load-3.4.0 b/app-misc/tmux-mem-cpu-load-3.4.0
deleted file mode 100644
index 2ddefd6c1496..000000000000
--- a/app-misc/tmux-mem-cpu-load-3.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CPU, RAM memory, and load monitor for use with tmux
-EAPI=6
-HOMEPAGE=https://github.com/thewtex/tmux-mem-cpu-load/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/thewtex/tmux-mem-cpu-load/archive/v3.4.0.tar.gz -> tmux-mem-cpu-load-3.4.0.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab23875e338deb5b5d820833910e5281
diff --git a/app-misc/tmux-mem-cpu-load-9999 b/app-misc/tmux-mem-cpu-load-9999
deleted file mode 100644
index 0505cbda0167..000000000000
--- a/app-misc/tmux-mem-cpu-load-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=CPU, RAM memory, and load monitor for use with tmux
-EAPI=6
-HOMEPAGE=https://github.com/thewtex/tmux-mem-cpu-load/
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7728100d5681899f34c5604268b22fb
diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest
new file mode 100644
index 000000000000..767a517465f5
--- /dev/null
+++ b/app-misc/tmux-mem-cpu-load/Manifest
@@ -0,0 +1,4 @@
+DIST tmux-mem-cpu-load-3.4.0.tar.gz 19483 BLAKE2B eeaabcd4447b326dbf77d3e5844971d2b466c93169993d4a16912bc4d0f777b07db1b0c2973dfaef9e0cd5b4f0dfd132043aed20170a1a7856d7a3c1f6a96ba8 SHA512 f963683faa86ff7b20a658787978ce3c4c36c41fabe297e18e4b1483e680d71a3b10c220dbae5c29bc7f7cb65e79839041b53c9aaee75a17bdc78bf0b76e8dc1
+EBUILD tmux-mem-cpu-load-3.4.0.ebuild 581 BLAKE2B 5572059462a46e64382b32562d9a33e603da0e68f9f42e8e6efd23b3d2fe6c4dde69538ed6e2a251c28f0bcbd5cf267b94afc2fa6315b020dc7cca6848eee750 SHA512 b31936ddf8d4af35aee77db6d533ea3da35756a32b44422c0cd387650eca952493462c35eb3905998429e564dc635ecfbc1b893341b42787c84cf256d88207ad
+EBUILD tmux-mem-cpu-load-9999.ebuild 572 BLAKE2B fb51d056e2ed67a413dcfe13a875d50f897722f204ff0a7502a21e982c6622554c4ca9daffd566c3369ec9d8eabfafffb5c95cb88ff960be4d2e35bf677bae94 SHA512 a1aad3db36b9dcf00bb35ed13c270bb4b168505c1ffbd7455217879e5de5052cb257ed5d9510725f6281f58f16f8c6a91bdafdc110246318aee34d6521876f44
+MISC metadata.xml 233 BLAKE2B e05b8f920dfe21c6d9317562a4a2254dd8064cdaf0ea234443cc2867d417d87ea06817f234423ad58b507204af8e7222e3930f379b9957db62123dc23e0c1b86 SHA512 51ddf069656109f26ff5d12f93672537e90f70a3df00f5ffc18f4b365bc41847e441dd7aad0c50e46fe84cdac5ca6dceca1bb96de365d508cfeef1dacbaa5a0e
diff --git a/app-misc/tmux-mem-cpu-load/metadata.xml b/app-misc/tmux-mem-cpu-load/metadata.xml
new file mode 100644
index 000000000000..334124a3a6e2
--- /dev/null
+++ b/app-misc/tmux-mem-cpu-load/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">thewtex/tmux-mem-cpu-load</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
new file mode 100644
index 000000000000..f54b4e254c51
--- /dev/null
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+IUSE=""
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
+ SRC_URI=""
+else
+ KEYWORDS="amd64 x86"
+ SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
+HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( AUTHORS README.rst )
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild
new file mode 100644
index 000000000000..a93c22ace65b
--- /dev/null
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+IUSE=""
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
+ SRC_URI=""
+else
+ KEYWORDS=""
+ SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
+HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( AUTHORS README.rst )
diff --git a/app-misc/tmux-xpanes-2.2.2 b/app-misc/tmux-xpanes-2.2.2
deleted file mode 100644
index f79d46359510..000000000000
--- a/app-misc/tmux-xpanes-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
-DESCRIPTION=tmux-based terminal divider
-EAPI=6
-HOMEPAGE=https://github.com/greymd/tmux-xpanes
-IUSE=zsh-completion
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v2.2.2.tar.gz -> tmux-xpanes-2.2.2.tar.gz
-_md5_=8230fc90a1aa336ddf4de19f9b6a5fe4
diff --git a/app-misc/tmux-xpanes-3.0.0 b/app-misc/tmux-xpanes-3.0.0
deleted file mode 100644
index dec88d47647e..000000000000
--- a/app-misc/tmux-xpanes-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
-DESCRIPTION=tmux-based terminal divider
-EAPI=6
-HOMEPAGE=https://github.com/greymd/tmux-xpanes
-IUSE=zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v3.0.0.tar.gz -> tmux-xpanes-3.0.0.tar.gz
-_md5_=beefed40bc7f934a21dd6fe83455d441
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
new file mode 100644
index 000000000000..c852871cc4b6
--- /dev/null
+++ b/app-misc/tmux-xpanes/Manifest
@@ -0,0 +1,5 @@
+DIST tmux-xpanes-2.2.2.tar.gz 34457 BLAKE2B b4f33ac6576db4100a4d6895c3c705fe3d44093a1c63d89c20f4203fb71160415903ae70880387f0419ec5bebdb9244a9e5802d9ae8a9c441e3ceebea1e70582 SHA512 0d5242daf95c0af78b64184ba1473620783072851f34fe2a91d4806dc529402bd506ada2e8a455b687f4504bac5cac8300249d555446edaa54a41f3b2eddd45c
+DIST tmux-xpanes-3.0.0.tar.gz 45256 BLAKE2B 6637e27816af643498bb7523fcdd39fc5e9272adb83101a20fd5c77f0917ae832986b3f811dab2020b0906dd81808438b9dba5cef737d502a0d91d2a72c4de19 SHA512 2a7187ac7251211f7fd6832cc60182621ae12f40de30cb3826452ea0e8b032351a261d1b1e7d79d87dfea3bbe95fd5140157e1b1e1ff29492f4df489aaec4711
+EBUILD tmux-xpanes-2.2.2.ebuild 702 BLAKE2B 814208eb19707396bb17779664288de0ab1c220daee34438a749ff752026738c882414547dc22eb6f1f10b19767d3b89ad461112202b936516b62ef8ae6c552d SHA512 1826a0673fd24ff1a5b16e8ee5a312b76be2267087c41239fa83482f56bffd43b9aacd74310f3405c408ab762d5ff5e3e875573db75bfccc6304aa0523b3e56f
+EBUILD tmux-xpanes-3.0.0.ebuild 696 BLAKE2B 527ab7ec0e715c5d7fd1d5e7606ed38d3b03bb7456f3a19f13c78fd96c9b461c487d4a9d259298af4add3877b07654fc7a441c82bcf9097c917fae9c395fd790 SHA512 e227032d13081dde2acd68e6862afaaf78e9cb7f8e37bc5cde724f74cde862eb5d4e513ac487c2d92530ebc5555f2f1ec7d15fbdf1cacccb80d0058b516e4943
+MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux-xpanes/metadata.xml b/app-misc/tmux-xpanes/metadata.xml
new file mode 100644
index 000000000000..70d20d789e99
--- /dev/null
+++ b/app-misc/tmux-xpanes/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">greymd/tmux-xpanes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
new file mode 100644
index 000000000000..8b1b598c9eab
--- /dev/null
+++ b/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="tmux-based terminal divider"
+HOMEPAGE="https://github.com/greymd/tmux-xpanes"
+SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="zsh-completion"
+
+RDEPEND="
+ app-misc/tmux
+ dev-lang/perl
+ dev-libs/openssl:0=
+ zsh-completion? ( app-shells/zsh )"
+
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+src_install() {
+ dobin bin/*
+ doman man/*.1
+ einstalldocs
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+ fi
+}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild
new file mode 100644
index 000000000000..9c3375a45245
--- /dev/null
+++ b/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="tmux-based terminal divider"
+HOMEPAGE="https://github.com/greymd/tmux-xpanes"
+SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="zsh-completion"
+
+RDEPEND="
+ app-misc/tmux
+ dev-lang/perl
+ dev-libs/openssl:0=
+ zsh-completion? ( app-shells/zsh )"
+
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+src_install() {
+ dobin bin/*
+ doman man/*.1
+ einstalldocs
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins completion/zsh/*
+ fi
+}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
new file mode 100644
index 000000000000..12e9a71f8884
--- /dev/null
+++ b/app-misc/tmux/Manifest
@@ -0,0 +1,9 @@
+AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
+DIST tmux-2.6.tar.gz 481000 BLAKE2B adbd276261f3f4be9d67c6c0fbad28a90eabbecfa68ebbc104fe56acaa9b7bd005060b854ce0a0e669fdf41dd058bfa8450a85a78f71f7248a44d25458f7d3bc SHA512 20a1ae8b8494c5b42757902322f3877731c2cc330c9c00f097a317785d25252b7ebaa8bbab9fc17843299e80cb2914aaac0a664715a85c50f7ea489d23753832
+DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
+DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
+DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
+EBUILD tmux-2.6.ebuild 2140 BLAKE2B eaf576a0984fee2d9ef0eee0d823d28e5e4949e5a80003e539cb936e74fe1acf07ed883b71936dc3fd3c681806e766108a20cc574eb36a165f9abe584df2bd2c SHA512 cc02589f7cba6668bfe99193e910e4816cb9ef5e0adf6660bd6d4d2a281e3821e2ed383c50c905a95f97ec3c10d9b0c22a4f1fd552d05d7e869731deefc985ca
+EBUILD tmux-2.7.ebuild 2149 BLAKE2B 82b7151467ddb249b8395c8775c9e434bec7bc886ae173a725fad25133e86f121dcc54d860561567cfdafc9610dd1a69fc1cfad59945fed7a06cfe7f1cee7c4d SHA512 b4ac254302f9c78bd6cf4ee1f54fc85720dbf80711efdbf8eac1ab477895121f6be17804947b8d6e3e07ae5518643e542462330194c371ffefe9f91666a1c126
+EBUILD tmux-9999.ebuild 2350 BLAKE2B a2fea8d287803a5779740ce34ed42ecf8f889f9b10020921aaf1e48d2fb65b12a43773caf04c088b5ac963d5b5f879746c789d4d24a839a1fcc040b370e109b4 SHA512 db22402a7bfa146ea6f4553f7f8d1291456466aa1c2938a747671fbd8123a7ab8cfba9a5ed4405d2c8faefdac93307e99ea55ddf3c5e60f0d5667603fe7d26f4
+MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/files/tmux-2.4-flags.patch b/app-misc/tmux/files/tmux-2.4-flags.patch
new file mode 100644
index 000000000000..5ef82a3fd5e0
--- /dev/null
+++ b/app-misc/tmux/files/tmux-2.4-flags.patch
@@ -0,0 +1,15 @@
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+--- tmux-2.4/Makefile.am
++++ tmux-2.4/Makefile.am
+@@ -17,9 +17,8 @@
+
+ # Set flags for gcc.
+ if IS_GCC
+-AM_CFLAGS += -std=gnu99 -O2
++AM_CFLAGS += -std=gnu99
+ if IS_DEBUG
+-AM_CFLAGS += -g
+ AM_CFLAGS += -Wno-long-long -Wall -W -Wformat=2
+ AM_CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
+ AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
new file mode 100644
index 000000000000..b1ac7e306662
--- /dev/null
+++ b/app-misc/tmux/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <use>
+ <flag name="utempter">Include libutempter support</flag>
+ </use>
+ <longdescription>
+ tmux is a "terminal multiplexer", it enables a number of terminals
+ (or windows) to be accessed and controlled from a single terminal.
+ tmux is intended to be a simple, modern, BSD-licensed alternative to
+ programs such as <pkg>app-misc/screen</pkg>.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">tmux/tmux</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
new file mode 100644
index 000000000000..d92a3ffb9579
--- /dev/null
+++ b/app-misc/tmux/tmux-2.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+ dev-libs/libevent:0=
+ sys-libs/ncurses:0=
+ utempter? (
+ kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )"
+
+DOCS=( CHANGES README TODO )
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4-flags.patch
+
+ # usptream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+ # bug 438558
+ # 1.7 segfaults when entering copy mode if compiled with -Os
+ replace-flags -Os -O2
+
+ # regenerate aclocal.m4 to support earlier automake versions
+ rm aclocal.m4 || die
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc
+ $(use_enable debug)
+ $(use_enable utempter)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ einstalldocs
+
+ dodoc example_tmux.conf
+ docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+ if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
+ echo
+ ewarn "Some configuration options changed in this release."
+ ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+ ewarn
+ ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+ ewarn "older, running tmux server instances. You'll have to use an existing client to"
+ ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+ ewarn "to temporarily downgrade to access them."
+ echo
+ fi
+}
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
new file mode 100644
index 000000000000..51aad0c12cd8
--- /dev/null
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+ dev-libs/libevent:0=
+ sys-libs/ncurses:0=
+ utempter? (
+ kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )"
+
+DOCS=( CHANGES README TODO )
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4-flags.patch
+
+ # usptream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+ # bug 438558
+ # 1.7 segfaults when entering copy mode if compiled with -Os
+ replace-flags -Os -O2
+
+ # regenerate aclocal.m4 to support earlier automake versions
+ rm aclocal.m4 || die
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc
+ $(use_enable debug)
+ $(use_enable utempter)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ einstalldocs
+
+ dodoc example_tmux.conf
+ docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+ if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
+ echo
+ ewarn "Some configuration options changed in this release."
+ ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+ ewarn
+ ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+ ewarn "older, running tmux server instances. You'll have to use an existing client to"
+ ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+ ewarn "to temporarily downgrade to access them."
+ echo
+ fi
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
new file mode 100644
index 000000000000..30b2bd54a86b
--- /dev/null
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools git-r3 flag-o-matic versionator
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b
+vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )"
+EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+ dev-libs/libevent:0=
+ sys-libs/ncurses:0=
+ utempter? (
+ kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ )"
+
+DEPEND="
+ ${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-screen )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )"
+
+DOCS=( CHANGES README TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4-flags.patch"
+
+ # usptream fixes (can be removed with next version bump)
+)
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+ # bug 438558
+ # 1.7 segfaults when entering copy mode if compiled with -Os
+ replace-flags -Os -O2
+
+ # regenerate aclocal.m4 to support earlier automake versions
+ rm -f aclocal.m4 || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc
+ $(use_enable debug)
+ $(use_enable utempter)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ einstalldocs
+
+ dodoc example_tmux.conf
+ docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+ if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
+ echo
+ ewarn "Some configuration options changed in this release."
+ ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+ ewarn
+ ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+ ewarn "older, running tmux server instances. You'll have to use an existing client to"
+ ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+ ewarn "to temporarily downgrade to access them."
+ echo
+ fi
+}
diff --git a/app-misc/todo-2.10-r2 b/app-misc/todo-2.10-r2
deleted file mode 100644
index 8c3288f02458..000000000000
--- a/app-misc/todo-2.10-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=A CLI-based TODO list manager
-EAPI=6
-HOMEPAGE=http://todotxt.com
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-shells/bash
-SLOT=0
-SRC_URI=https://github.com/ginatrapani/todo.txt-cli/archive/v2.10.tar.gz -> todo-2.10.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=25bf7ea3bd7458a0659d17d058e95633
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
new file mode 100644
index 000000000000..f18afde93eaf
--- /dev/null
+++ b/app-misc/todo/Manifest
@@ -0,0 +1,4 @@
+AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
+DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
+EBUILD todo-2.10-r2.ebuild 1382 BLAKE2B ff3db41a533a0b4ce6ab4ff531cd2fdc77efdaf791ee4dbc910ca3406dc5330d5ad457ec7ebd3546b0ac21ca4ad89b17ac3716fa3cd9940a254bf721eb5326e5 SHA512 65deff8ee79cab1ccfafeff098960bbe5c9c1585d48f55c5beb112fbf9090bb15b50e29ea6d3489ba581b80d0a413d47987edb3a6d595af96bdfbd7292bce203
+MISC metadata.xml 340 BLAKE2B 8102ae5fb34dd55116c96b815406f86d08345c3e039d5c2878b8e7f8e0e4d6a60543ae7cbf9d2ba877230b40175dcaf6e7eae6d7877ee536a6ff30786e660584 SHA512 ff000ddeb9f4b80721053c17a66f5d9792b601c4710a3577ae86fc09ddd3456b934aecad94297b5985338a87ace1b59288394fcef05bd002cd2180ccf6f59a84
diff --git a/app-misc/todo/files/todo-2.10-fix-bash-completion.patch b/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
new file mode 100644
index 000000000000..7e6de2f10568
--- /dev/null
+++ b/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
@@ -0,0 +1,12 @@
+--- ./todo_completion 2017-04-08 15:18:23.102736966 +0200
++++ ./todo_completion 2017-04-08 15:18:56.839725605 +0200
+@@ -85,6 +85,9 @@
+ }
+ complete -F _todo todo.sh
+
++# Gentoo bug 614400
++complete -F _todo todotxt
++
+ # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
+ # completion for it, too:
+ #complete -F _todo t
diff --git a/app-misc/todo/metadata.xml b/app-misc/todo/metadata.xml
new file mode 100644
index 000000000000..18711a51920c
--- /dev/null
+++ b/app-misc/todo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ginatrapani/todo.txt-cli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/todo/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.10-r2.ebuild
new file mode 100644
index 000000000000..69c2994478d7
--- /dev/null
+++ b/app-misc/todo/todo-2.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="A CLI-based TODO list manager"
+HOMEPAGE="http://todotxt.com"
+SRC_URI="https://github.com/ginatrapani/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-shells/bash"
+
+PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
+
+DOCS=( README.textile CONTRIBUTING.md LICENSE todo.cfg )
+
+S="${WORKDIR}/${PN}.txt-cli-${PV}"
+
+src_prepare() {
+ default
+
+ # TODO_DIR variable is bogus
+ sed -i -e '/export TODO_DIR/d' todo.cfg || die
+ sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
+}
+
+src_test() {
+ make test || die "tests failed"
+}
+
+src_install() {
+ newbin "${PN}.sh" "${PN}cli"
+ dosym "${PN}cli" "/usr/bin/${PN}txt"
+ newbashcomp "${PN}_completion" "${PN}cli.sh"
+ bashcomp_alias "${PN}cli.sh" "${PN}txt"
+ einstalldocs
+}
+
+pkg_postinst() {
+ einfo
+ einfo 'Before starting todo, make sure to create'
+ einfo 'a .todo directory in your home directory:'
+ einfo ' $ mkdir -p $HOME/.todo'
+ einfo
+ einfo 'and make sure to copy the default todo'
+ einfo 'configuration file in the same location:'
+ einfo " $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
+ einfo
+ einfo 'You can then edit this file as you see fit.'
+ einfo 'Enjoy!'
+ einfo
+}
diff --git a/app-misc/toilet-0.3 b/app-misc/toilet-0.3
deleted file mode 100644
index 291aa1a0fd48..000000000000
--- a/app-misc/toilet-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libcaca-0.99_beta18 virtual/pkgconfig
-DESCRIPTION=The Other Implementations letters. Figlet replacement
-EAPI=4
-HOMEPAGE=http://caca.zoy.org/wiki/toilet
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=WTFPL-2
-RDEPEND=>=media-libs/libcaca-0.99_beta18
-SLOT=0
-SRC_URI=http://caca.zoy.org/raw-attachment/wiki/toilet/toilet-0.3.tar.gz
-_md5_=d24fe4fa9eebbae4854a07d9161e0d15
diff --git a/app-misc/toilet/Manifest b/app-misc/toilet/Manifest
new file mode 100644
index 000000000000..802caf2cfc22
--- /dev/null
+++ b/app-misc/toilet/Manifest
@@ -0,0 +1,3 @@
+DIST toilet-0.3.tar.gz 864880 BLAKE2B 824ed5ecf4ee7ae470290f5fa33fdf6489098481b92370138a75c3a50ef1a1f9e9d6572de06c257272b97c45ca27246e52d9342e77d794917553176c1b301dd0 SHA512 64b9389562a51e7dba6e3f1dd27c5340f90df25d8fbf1e041b539f5243b5b6b7af1ebf033a511053ad72a73908d496a1f3d14c4ac656425aefb8364a0664ceed
+EBUILD toilet-0.3.ebuild 661 BLAKE2B 8dbfc46c2607793eb83f2ac2ed5a62111f1c56a6857a3bd5bf3746bb891439a8aa08fd73b6c464954ea1b2af99a5d094646581473cc2d251b03970445418a558 SHA512 cbb0a9290afd871c54351f9a9a9d900fa840f3985abc1dfa0fa0f44762a2edebb1f0a53a1f3cdce4c4ad024c0e9e0e877351952bdfd69b36a78906e526c74884
+MISC metadata.xml 249 BLAKE2B 1722f80741ce712dbd34c3303b85c48066798ae7615211d818bf6eb72e8d6c13ca8481bcc772589180897ee04b3cd4775cc57476a810919b7d0869636487fc41 SHA512 01701bb0df421af74cc138746d8846d9eec35835e817789624027ed0b48504e72a3484cece45950f005d39e5e23eb45f595b89085878f28a273e883af1673be3
diff --git a/app-misc/toilet/metadata.xml b/app-misc/toilet/metadata.xml
new file mode 100644
index 000000000000..57798f078517
--- /dev/null
+++ b/app-misc/toilet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/toilet/toilet-0.3.ebuild b/app-misc/toilet/toilet-0.3.ebuild
new file mode 100644
index 000000000000..614b0cac935e
--- /dev/null
+++ b/app-misc/toilet/toilet-0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="The Other Implementations letters. Figlet replacement"
+HOMEPAGE="http://caca.zoy.org/wiki/toilet"
+SRC_URI="http://caca.zoy.org/raw-attachment/wiki/${PN}/${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libcaca-0.99_beta18"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i \
+ -e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
+ configure || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog NEWS README TODO
+}
diff --git a/app-misc/towitoko-2.0.7-r2 b/app-misc/towitoko-2.0.7-r2
deleted file mode 100644
index fc92594e3b7d..000000000000
--- a/app-misc/towitoko-2.0.7-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Provides a driver for using Towitoko smartcard readers under UNIX environment
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-IUSE=moneyplex
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/towitoko-2.0.7.tar.gz
-_md5_=408ead919900b23b06993cb562d8a5d2
diff --git a/app-misc/towitoko-2.0.7-r3 b/app-misc/towitoko-2.0.7-r3
deleted file mode 100644
index 7c366ecbf3b6..000000000000
--- a/app-misc/towitoko-2.0.7-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure postinst
-DESCRIPTION=Driver for Towitoko smartcard readers
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-IUSE=moneyplex
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/towitoko-2.0.7.tar.gz
-_md5_=f4383eca80010ad6c55001507a900187
diff --git a/app-misc/towitoko/Manifest b/app-misc/towitoko/Manifest
new file mode 100644
index 000000000000..99d699d7327a
--- /dev/null
+++ b/app-misc/towitoko/Manifest
@@ -0,0 +1,4 @@
+DIST towitoko-2.0.7.tar.gz 280177 BLAKE2B 0a58abc81a8106415d25d82a9eab4338d8a1cb8dc04b2d7b1d3790ae1c8429d0fdec2641dae68a9f38b3ce9aa9f14fa5ba1fb4fa9281e75e87a308024ba59873 SHA512 e2e21bda3b1dad55dee1cfb4063e114394a21973b4b2409b9dcff1479fc312fb93bf6e634d38e1f7a30e6f835d87af8268a478b534f65c916eeb13d5dbd07b86
+EBUILD towitoko-2.0.7-r2.ebuild 823 BLAKE2B f4246660a93b0230fe1f83c7b0cf8f813dbde49253ddbe6085feb482250eecf19d551ea10cf877e2c51cc50b6c16ed906b0b2c3c55f01fccaa80fe61dd62f7ba SHA512 9b2df0e8bfc47f14dc22d975b5ba96c02ff91fdfb513f6f95b70e1edd220568ab302193f1b83976999c3b452cb0a127bfffc12e492f65cba177cccc98e832774
+EBUILD towitoko-2.0.7-r3.ebuild 674 BLAKE2B 3b505cf5b7d408c6932b6023ca519e6c6672bbac1e6788c943ae2983b9cf9e594612b15432651b0ee357cdd5dd5660db1500c567902c7c278e90c2a5b756e172 SHA512 bdab3d73bd1326a36c8003729945aab452e59f1e61e2016c74043b0dd7d77983fe4c959add096e488c3f8e79160c9145c4b0138963fc5db28188407dbedb9fce
+MISC metadata.xml 278 BLAKE2B 6cb5d9c1e26e7c00636842a387c8b772f44a284cd24fb44e8133edd04d4d37a2fac01d0cf77768b88137ea7ab302554adf4a32e41df5246b2ab01ac21476f8a9 SHA512 4d69e222be58da2fefd590fa9cdfa2dd6e7108c3f663fb0f491d49609b0ebb8e10b4dccf22966d09f83b81074f0543723837b60015e7d4102b7a7085744c770a
diff --git a/app-misc/towitoko/metadata.xml b/app-misc/towitoko/metadata.xml
new file mode 100644
index 000000000000..7fbec1b41d1c
--- /dev/null
+++ b/app-misc/towitoko/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+ <flag name="moneyplex">Makes libtowitoko work for the moneyplex home banking
+ software</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/towitoko/towitoko-2.0.7-r2.ebuild b/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
new file mode 100644
index 000000000000..fb31a59e4793
--- /dev/null
+++ b/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+IUSE="moneyplex"
+
+DESCRIPTION="Provides a driver for using Towitoko smartcard readers under UNIX environment"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="https://www.gentoo.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc x86"
+
+src_compile() {
+ local myconf
+
+ myconf=""
+ use moneyplex && myconf="${myconf} --disable-atr-check"
+
+ econf \
+ $(use_enable moneyplex win32-com) \
+ ${myconf} || die "econf failed"
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
+
+pkg_postinst() {
+ if ! use moneyplex
+ then
+ elog "If you want to use the moneyplex home banking software from"
+ elog "http://www.matrica.de"
+ elog "then please re-emerge this package with 'moneyplex' in USE"
+ fi
+}
diff --git a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
new file mode 100644
index 000000000000..0538c5fd15b7
--- /dev/null
+++ b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Driver for Towitoko smartcard readers"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+
+IUSE="moneyplex"
+
+src_configure() {
+ local myconf
+ use moneyplex && myconf="--disable-atr-check"
+ econf \
+ $(use_enable moneyplex win32-com) \
+ "${myconf}"
+}
+
+pkg_postinst() {
+ if ! use moneyplex; then
+ elog "If you want to use the moneyplex home banking software from"
+ elog "http://www.matrica.de"
+ elog "then please re-emerge this package with 'moneyplex' in USE"
+ fi
+}
diff --git a/app-misc/tpconfig-3.1.3-r1 b/app-misc/tpconfig-3.1.3-r1
deleted file mode 100644
index 2b6adc021970..000000000000
--- a/app-misc/tpconfig-3.1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour
-EAPI=0
-HOMEPAGE=http://www.compass.com/synaptics/
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.compass.com/tpconfig/tpconfig-3.1.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1c3ded040654ef1929b867ac5fca170d
diff --git a/app-misc/tpconfig-3.1.3-r2 b/app-misc/tpconfig-3.1.3-r2
deleted file mode 100644
index a9eb49705f67..000000000000
--- a/app-misc/tpconfig-3.1.3-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour
-EAPI=0
-HOMEPAGE=http://www.compass.com/synaptics/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.compass.com/tpconfig/tpconfig-3.1.3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fdde8be636bac7b0cc04050066cc2e9d
diff --git a/app-misc/tpconfig/Manifest b/app-misc/tpconfig/Manifest
new file mode 100644
index 000000000000..e0d86bf633cb
--- /dev/null
+++ b/app-misc/tpconfig/Manifest
@@ -0,0 +1,6 @@
+AUX tpconfig 426 BLAKE2B 8ef3bef0ca0e50d6f220c4ab7cefc9002bdfffb6c018173d181c3e1dab6cc0fca07c3e8fca4c251efc308f24324e382c7477267a18ca792c993a1247e8bf75be SHA512 09c0a954b765404eeee569040b832883f85b2451c41ca4465ef5febf80745fb9a65fdabadff9967f014d064134c353c66953c26e7295b4ced3dbc172975d536e
+AUX tpconfig.conf 132 BLAKE2B 9d5f6490eee22c619d458a5190889867c1995f294aec1ed60bc6edcb2c83b3c47d94c473ec52d367eadf441e73258bcb5e2a0ceb0e578b6c0df6069231514649 SHA512 314f05fb3211790e9c5de47f99d14bcf96788f8baf1d5258eb17d71dea05f0bde7b249a99321f472e4339c066705d9f18b529f97b1c03a72da4f21c14b91f77a
+DIST tpconfig-3.1.3.tar.gz 106789 BLAKE2B 1a02a1c91ce2174ae406888a73ad488d79e60941d0e904f47c9ff1cc82319780cf9874ede6ec4b18cc9176bcaeb465c201fca1bdf5840029565e5a3c5cac85f7 SHA512 b10b709f113dcd526c7521f519466677a1dd37b5c3bd4adf7a0fdbf95428bf56777a726b85e158c4842d406e7659f1b6e161c68bc6f6c6739d376ab84351efc9
+EBUILD tpconfig-3.1.3-r1.ebuild 624 BLAKE2B 0b92b934ad41e74ec13dc4b44a1301cd1a1aca10d52ab977db49ad83bbd385dcaeaea58e686813c00a69e8d99750c22344b82df2216debe43f488cc03b2723fd SHA512 2ba37d238c27320b483a041044b552271c077376238bf61c6460fde01e887b23c21ebafc7f5a342ee383b478f526b14d008eaeecf1f58cbb5546024e29f7530c
+EBUILD tpconfig-3.1.3-r2.ebuild 571 BLAKE2B cd7065bdac05e3ea3ab75582f7815b7f2844a8e170dee34aa26b84572f536a68368b99e236bb76f1b8b66593f08bfb22636731115bfdb3edd5324e7d3624249f SHA512 00477cd9e913f37dd58a9a91e2ffd8ed8e195ee1b4afc59389ff6cf334eacb5c71f7a391d5769c7be699741e52e2c49838b042e6fa232d34b78bb62b2df8ef2b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tpconfig/files/tpconfig b/app-misc/tpconfig/files/tpconfig
new file mode 100644
index 000000000000..6eafbb5803ea
--- /dev/null
+++ b/app-misc/tpconfig/files/tpconfig
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ before xdm
+}
+
+start() {
+ ebegin "Loading tpconfig options..."
+ /usr/bin/tpconfig ${TPOPTIONS} > /dev/null 2> /tmp/tpconfig.start
+ if [ -z "`cat /tmp/tpconfig.start 2> /dev/null`" ]; then
+ eend 0
+ else
+ eend 1
+ fi
+}
+
+stop() {
+ ebegin "Stoping tpconfig (this does nothing)..."
+ eend 0
+}
diff --git a/app-misc/tpconfig/files/tpconfig.conf b/app-misc/tpconfig/files/tpconfig.conf
new file mode 100644
index 000000000000..6566b926710e
--- /dev/null
+++ b/app-misc/tpconfig/files/tpconfig.conf
@@ -0,0 +1,4 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+TPOPTIONS="--tapmode=0"
diff --git a/app-misc/tpconfig/metadata.xml b/app-misc/tpconfig/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/tpconfig/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..4fe0e3cb8031
--- /dev/null
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs
+
+DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
+HOMEPAGE="http://www.compass.com/synaptics/"
+SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+src_compile() {
+ econf
+ emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+ dobin tpconfig || die "dobin failed!"
+ dodoc README AUTHORS NEWS INSTALL
+ doinitd "${FILESDIR}"/tpconfig
+ newconfd "${FILESDIR}"/tpconfig.conf tpconfig
+}
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
new file mode 100644
index 000000000000..334811db95d8
--- /dev/null
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs
+
+DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
+HOMEPAGE="http://www.compass.com/synaptics/"
+SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README AUTHORS NEWS INSTALL )
+
+src_compile() {
+ econf
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin "${PN}"
+ doinitd "${FILESDIR}"/"${PN}"
+ newconfd "${FILESDIR}"/"${PN}.conf" "${PN}"
+}
diff --git a/app-misc/tpipe-1.6-r1 b/app-misc/tpipe-1.6-r1
deleted file mode 100644
index 9f222c99798c..000000000000
--- a/app-misc/tpipe-1.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Command to duplicate standard input to more than one program
-EAPI=6
-HOMEPAGE=http://www.eurogaran.com/downloads/tpipe
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.eurogaran.com/downloads/tpipe/tpipe-1.6.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=55de38c99ee3968cb4a20e9fc016ef7d
diff --git a/app-misc/tpipe/Manifest b/app-misc/tpipe/Manifest
new file mode 100644
index 000000000000..231135b8b04b
--- /dev/null
+++ b/app-misc/tpipe/Manifest
@@ -0,0 +1,3 @@
+DIST tpipe-1.6.tar.gz 12425 BLAKE2B 858af3a98efa0f27fd07aa49ad99928326ff8d458c6eddd790bcc487bdda26971a031d3bc539b07e8a031ec5190fd089d5bcd8490da1c26c1df480b3367d5f05 SHA512 3429a7ee0711f47e87ed2c46009c43dd7c3fa378a98083da58f22d1cd0a87cbbe7a900e98abc05d1375ffe8cfe56e02d25991f53a42bca1825556b07983bbb8d
+EBUILD tpipe-1.6-r1.ebuild 593 BLAKE2B fc82932596282b8beb6bdad096c834d30d4287c36bf15799c3562dc56d4f0485ebcf2629a247845496aed26a10f76578e7e0e6d7e6edaa00f404b51b0cefa2eb SHA512 945b18bf06a9f1c7dc44f310c093c94505ea0cff40aa171d6fcd886ae4923cac4c62396ecfbf6944ff915aa6aa324c2ca06d3c00f8624a204da8f8d096d51f3e
+MISC metadata.xml 340 BLAKE2B 1b8e3d8c63bbf9c13abb02d6b481b48c873e490e3b51433aa383e1200e0f4973db3185fc35d4b1d86769e2676472a05121201d6b1097eb9c9967560eb5b47cb9 SHA512 89a4258d97e48449e730ace4f3a7a3b65311a9fac535898d3812bc10f678969c9efeaa82c5b978fc594cfbd89ce04509bb988d97bf063bf1f0b50139888bc4a7
diff --git a/app-misc/tpipe/metadata.xml b/app-misc/tpipe/metadata.xml
new file mode 100644
index 000000000000..02adc18a1cf9
--- /dev/null
+++ b/app-misc/tpipe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/tpipe/tpipe-1.6-r1.ebuild b/app-misc/tpipe/tpipe-1.6-r1.ebuild
new file mode 100644
index 000000000000..034575fcdaa3
--- /dev/null
+++ b/app-misc/tpipe/tpipe-1.6-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command to duplicate standard input to more than one program"
+HOMEPAGE="http://www.eurogaran.com/downloads/tpipe"
+SRC_URI="http://www.eurogaran.com/downloads/tpipe/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DOCS=( README.txt )
+
+src_compile() {
+ emake OPTFLAGS="-ansi -pedantic ${CFLAGS}" \
+ PREFIX=/usr \
+ CC="$(tc-getCC)" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/tprint-1.1.0-r1 b/app-misc/tprint-1.1.0-r1
deleted file mode 100644
index 6d2ae2ba190c..000000000000
--- a/app-misc/tprint-1.1.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Transparent Print Utility for terminals
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/tprint/
-KEYWORDS=~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/tprint/tprint-1.1.0.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b9ecc26b2f2535c76bb17b647d156eb5
diff --git a/app-misc/tprint/Manifest b/app-misc/tprint/Manifest
new file mode 100644
index 000000000000..685f5a8ce6b4
--- /dev/null
+++ b/app-misc/tprint/Manifest
@@ -0,0 +1,3 @@
+DIST tprint-1.1.0.tar.gz 14089 BLAKE2B 5cba4162ec111c9eb41b883e9e1582b1885117000189e63a1c3d529df695fade156228318d7b86a5c2eb69ecb8d9ec70ad40a4deb624b5474a052f3d0557dd15 SHA512 828135ba52a163b00257e243e683f0f01b3a47b161785c70aa2b43f227859a6a4e629687d07190c42941ab03012d6bb1eddeb3767f177af6302a873cb7713831
+EBUILD tprint-1.1.0-r1.ebuild 611 BLAKE2B 8e5cb9d3446a68e9f3e097b816c45b7042a0292e7d4465ff49363643dda354d8d411f887a852687d705a04fc16b777293b4469848159ba47c9adcbf18bbd22aa SHA512 afb0cce8179978308ef74572081f07238c11797d2bc9db55ef858a9507417a6eb167224b8052611358032f252d284332c7dda8e9b77c21fd6bd06ab2f2dc187c
+MISC metadata.xml 421 BLAKE2B 73570ad9de56bc18aacba474b07f49edd35d562f1d5220318b0200d14ccc0c5a2ac12f6a9b5c0d7c51ccaba31e53671838c924dbda322db376cd6dc0bb1d755c SHA512 2cd028ad4b59baccac477041c36891bc3f3db16c76aae0495864ae29e31f61f53a280eaff170c9ba0acade5beaf1a632524a770b08fb11ebbf8ec90dc2cc09d4
diff --git a/app-misc/tprint/metadata.xml b/app-misc/tprint/metadata.xml
new file mode 100644
index 000000000000..05878c967542
--- /dev/null
+++ b/app-misc/tprint/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription>The Transparent Print utility program for Linux. Provides an easy way to transparently print to serial terminals that have printers attached.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">tprint</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/tprint/tprint-1.1.0-r1.ebuild b/app-misc/tprint/tprint-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..b473dcc73077
--- /dev/null
+++ b/app-misc/tprint/tprint-1.1.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Transparent Print Utility for terminals"
+HOMEPAGE="https://sourceforge.net/projects/tprint/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's:cc:$(CC):g' \
+ -e 's:-g -O2:$(CFLAGS) $(LDFLAGS):g' \
+ || die "sed failed"
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ insinto /etc/tprint
+ doins tprint.conf
+ dobin tprint
+
+ dodoc INSTALL README
+}
diff --git a/app-misc/tracker-1.12.4 b/app-misc/tracker-1.12.4
deleted file mode 100644
index 9f7492bef479..000000000000
--- a/app-misc/tracker-1.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IUSE=cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps kernel_linux test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.12.4 )
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 )
-REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0abe9fe8e5c01e926bac1ed139f0b420
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
new file mode 100644
index 000000000000..0b81af2a95a1
--- /dev/null
+++ b/app-misc/tracker/Manifest
@@ -0,0 +1,3 @@
+DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
+EBUILD tracker-1.12.4.ebuild 7607 BLAKE2B 81fad33e737d27d9c27f4f9817a5f38a96d51e8d56f03e04da8b5ad4a131bd73243a2046cf2401bfbdcadaa6058da9fcf3305a816cd975f4134db06245a9b121 SHA512 cf76e06d94b6d64930ffdf04e9aa9f660f294a2ed7360f8a99fdd220747e08d376eb44c4b46194dd599357f2ef3e0abf56d21dbfd69ad366ace1c0172447fca3
+MISC metadata.xml 1561 BLAKE2B ce0e9984983c7e0f249af4d375361f64236fb38d105b9ce2cee6c12519c70d4e8c7801a6000adfe777b2f9bb787c47779246b148dbbb5ec6fb6e94356413d8d3 SHA512 89deedce6c26547cdc8a2b3ff1880662125b73f490293156904a942acf632e1325dbc3657cdd6a1ca53cdb7556adbd96fea2705759a0a5503e80ae95d90045c4
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
new file mode 100644
index 000000000000..64efbfdb6eb6
--- /dev/null
+++ b/app-misc/tracker/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="cue">Enable cue sheet parsing</flag>
+ <!-- 'firefox-bookmarks' instead of 'firefox' to prevent most users from
+ enabling this by accident; it has some stability problems and
+ performance implications -->
+ <flag name="firefox-bookmarks">Install bookmark data miner plugin for
+ <pkg>www-client/firefox</pkg> and <pkg>www-client/firefox-bin</pkg></flag>
+ <flag name="gsf">Enable <pkg>gnome-extra/libgsf</pkg> based data extractor and
+ for ODT.</flag>
+ <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
+ <flag name="iso">Enable extraction of metadata from ISO disk images</flag>
+ <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag>
+ <flag name="nautilus">Enable tracker to integrate with
+ <pkg>gnome-base/nautilus</pkg> by providing entries in its context menu
+ </flag>
+ <flag name="playlist">Add support for playlists</flag>
+ <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>
+ <flag name="thunderbird">Install email data miner plugin for
+ <pkg>mail-client/thunderbird</pkg> and
+ <pkg>mail-client/thunderbird-bin</pkg></flag>
+ <flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/tracker/tracker-1.12.4.ebuild b/app-misc/tracker/tracker-1.12.4.ebuild
new file mode 100644
index 000000000000..0cc6d681e2d8
--- /dev/null
+++ b/app-misc/tracker/tracker-1.12.4.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/100"
+IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer
+gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist
+rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+REQUIRED_USE="
+ ?? ( gstreamer ffmpeg )
+ cue? ( gstreamer )
+ upnp-av? ( gstreamer )
+ !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
+"
+
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# seccomp is automagic, though we want to use it whenever possible (linux)
+# >=media-libs/libmediaart-1.9:2.0 is suggested to be disabled for 1.10 for security;
+# It is disable in configure in 1.12; revisit for 1.14/2 (configure flag)
+RDEPEND="
+ >=app-i18n/enca-1.9
+ >=dev-db/sqlite-3.20:=
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/gobject-introspection-0.9.5:=
+ >=dev-libs/icu-4.8.1.1:=
+ >=dev-libs/json-glib-1.0
+ >=media-libs/libpng-1.2:0=
+ >=net-libs/libsoup-2.40:2.4
+ >=x11-libs/pango-1:=
+ sys-apps/util-linux
+ virtual/imagemagick-tools[png,jpeg?]
+
+ cue? ( media-libs/libcue )
+ elibc_glibc? ( >=sys-libs/glibc-2.12 )
+ exif? ( >=media-libs/libexif-0.6 )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ firefox-bookmarks? ( || (
+ >=www-client/firefox-4.0
+ >=www-client/firefox-bin-4.0 ) )
+ flac? ( >=media-libs/flac-1.2.1 )
+ gif? ( media-libs/giflib:= )
+ gsf? ( >=gnome-extra/libgsf-1.14.24 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ gtk? (
+ >=x11-libs/gtk+-3:3 )
+ iptc? ( media-libs/libiptcdata )
+ iso? ( >=sys-libs/libosinfo-0.2.9:= )
+ jpeg? ( virtual/jpeg:0 )
+ upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
+ mp3? ( >=media-libs/taglib-1.6 )
+ networkmanager? ( >=net-misc/networkmanager-0.8:= )
+ pdf? (
+ >=x11-libs/cairo-1:=
+ >=app-text/poppler-0.16[cairo,utils]
+ >=x11-libs/gtk+-2.12:2 )
+ playlist? ( >=dev-libs/totem-pl-parser-3 )
+ rss? ( >=net-libs/libgrss-0.7:0 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ thunderbird? ( || (
+ >=mail-client/thunderbird-5.0
+ >=mail-client/thunderbird-bin-5.0 ) )
+ tiff? ( media-libs/tiff:0 )
+ upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
+ vorbis? ( >=media-libs/libvorbis-0.22 )
+ xml? ( >=dev-libs/libxml2-2.6 )
+ xmp? ( >=media-libs/exempi-2.1 )
+ xps? ( app-text/libgxps )
+ !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+ seccomp? ( >=sys-libs/libseccomp-2.0 )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.8
+ >=dev-util/intltool-0.40.0
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ test? (
+ >=dev-libs/dbus-glib-0.82-r1
+ >=sys-apps/dbus-1.3.1[X] )
+"
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
+
+function inotify_enabled() {
+ if linux_config_exists; then
+ if ! linux_chkconfig_present INOTIFY_USER; then
+ ewarn "You should enable the INOTIFY support in your kernel."
+ ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+ ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+ die 'missing CONFIG_INOTIFY'
+ fi
+ else
+ einfo "Could not check for INOTIFY support in your kernel."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ inotify_enabled
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Don't run 'firefox --version' or 'thunderbird --version'; it results in
+ # access violations on some setups (bug #385347, #385495).
+ create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+ create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+ eautoreconf # See bug #367975
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+
+ if use gstreamer ; then
+ myconf="${myconf} --enable-generic-media-extractor=gstreamer"
+ if use upnp-av; then
+ myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
+ else
+ myconf="${myconf} --with-gstreamer-backend=discoverer"
+ fi
+ elif use ffmpeg ; then
+ myconf="${myconf} --enable-generic-media-extractor=libav"
+ else
+ myconf="${myconf} --enable-generic-media-extractor=external"
+ fi
+
+ # unicode-support: libunistring, libicu or glib ?
+ # According to NEWS, introspection is required
+ # is not being generated
+ # nautilus extension is in a separate package, nautilus-tracker-tags
+ # miner-evolution disabled as it's incompatible with current eds
+ gnome2_src_configure \
+ --disable-hal \
+ --disable-miner-evolution \
+ --disable-nautilus-extension \
+ --disable-static \
+ --enable-abiword \
+ --enable-artwork \
+ --enable-dvi \
+ --enable-enca \
+ --enable-guarantee-metadata \
+ --enable-icon \
+ --enable-introspection \
+ --disable-libmediaart \
+ --enable-libpng \
+ --enable-miner-apps \
+ --enable-miner-user-guides \
+ --enable-ps \
+ --enable-text \
+ --enable-tracker-fts \
+ --enable-tracker-writeback \
+ --with-unicode-support=libicu \
+ --with-bash-completion-dir="$(get_bashcompdir)" \
+ $(use_enable cue libcue) \
+ $(use_enable exif libexif) \
+ $(use_enable firefox-bookmarks miner-firefox) \
+ $(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
+ FIREFOX="${S}"/firefox-version.sh \
+ $(use_enable flac libflac) \
+ $(use_enable gif libgif) \
+ $(use_enable gsf libgsf) \
+ $(use_enable gtk tracker-needle) \
+ $(use_enable gtk tracker-preferences) \
+ $(use_enable iptc libiptcdata) \
+ $(use_enable iso libosinfo) \
+ $(use_enable jpeg libjpeg) \
+ $(use_enable upower upower) \
+ $(use_enable miner-fs) \
+ $(use_enable mp3 taglib) \
+ $(use_enable mp3) \
+ $(use_enable networkmanager network-manager) \
+ $(use_enable pdf poppler) \
+ $(use_enable playlist) \
+ $(use_enable rss miner-rss) \
+ $(use_enable stemmer libstemmer) \
+ $(use_enable test functional-tests) \
+ $(use_enable test unit-tests) \
+ $(use_enable thunderbird miner-thunderbird) \
+ $(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
+ THUNDERBIRD="${S}"/thunderbird-version.sh \
+ $(use_enable tiff libtiff) \
+ $(use_enable vorbis libvorbis) \
+ $(use_enable xml libxml2) \
+ $(use_enable xmp exempi) \
+ $(use_enable xps libgxps) \
+ ${myconf}
+}
+
+src_test() {
+ # G_MESSAGES_DEBUG, upstream bug #699401#c1
+ virtx emake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Manually symlink extensions for {firefox,thunderbird}-bin
+ if use firefox-bookmarks; then
+ dosym ../../../share/xul-ext/trackerfox \
+ /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
+ fi
+
+ if use thunderbird; then
+ dosym ../../../share/xul-ext/trackerbird \
+ /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+ fi
+}
+
+create_version_script() {
+ # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+ local v=$(best_version ${1})
+ v=${v#${1}-}
+ local vbin=$(best_version ${1}-bin)
+ vbin=${vbin#${1}-bin-}
+
+ if [[ -z ${v} ]]; then
+ v=${vbin}
+ else
+ version_compare ${v} ${vbin}
+ [[ $? -eq 1 ]] && v=${vbin}
+ fi
+
+ echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+ chmod +x "$3" || die
+}
diff --git a/app-misc/trash-cli-0.12.9.14-r2 b/app-misc/trash-cli-0.12.9.14-r2
deleted file mode 100644
index 4a17f1a4cc23..000000000000
--- a/app-misc/trash-cli-0.12.9.14-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python scripts to manipulate trash cans via the command line
-EAPI=5
-HOMEPAGE=https://github.com/andreafrancia/trash-cli
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/andreafrancia/trash-cli/tarball/0.12.9.14 -> trash-cli-0.12.9.14.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c125bec99e1de6b669cee6cae2c2f125
diff --git a/app-misc/trash-cli-0.16.12.29 b/app-misc/trash-cli-0.16.12.29
deleted file mode 100644
index f11d743a8471..000000000000
--- a/app-misc/trash-cli-0.16.12.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python scripts to manipulate trash cans via the command line
-EAPI=5
-HOMEPAGE=https://github.com/andreafrancia/trash-cli
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/andreafrancia/trash-cli/tarball/0.16.12.29 -> trash-cli-0.16.12.29.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80f5c55bffcc8b936e5d1a411582f200
diff --git a/app-misc/trash-cli-0.17.1.14 b/app-misc/trash-cli-0.17.1.14
deleted file mode 100644
index 9593ad4b68c1..000000000000
--- a/app-misc/trash-cli-0.17.1.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python scripts to manipulate trash cans via the command line
-EAPI=6
-HOMEPAGE=https://github.com/andreafrancia/trash-cli
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/andreafrancia/trash-cli/archive/0.17.1.14.tar.gz -> trash-cli-0.17.1.14.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43d590eb9a1f3355dc04819ff62ee392
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
new file mode 100644
index 000000000000..31d97e220a43
--- /dev/null
+++ b/app-misc/trash-cli/Manifest
@@ -0,0 +1,7 @@
+DIST trash-cli-0.12.9.14.tar.gz 62090 BLAKE2B b227fe852aa204156b197e14e8dd34e1f9883f0dde11512842a2705ea20d781db031552f4b355096521fe720cd48d6fded74aa5d173d423bd3b6b8e77f413a1a SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c
+DIST trash-cli-0.16.12.29.tar.gz 66826 BLAKE2B 0d8b56a1ac23272ea9c53b732e679ce4b92173e404afeb7611d781cebde32ff9895d751176ab038444fd5a98920ab725cca909c5920d9c28ab32408bf5fe2e84 SHA512 a8a94205233ac600a98324b95829d1f00debaca95c85c51fa12f7a65ae6f24fda58370d8fe0095bf33327cbddae7dfb02c2587efffd2d7c206c7f7cb0a59953e
+DIST trash-cli-0.17.1.14.tar.gz 69141 BLAKE2B 028274ea2753eb3ff4bfec5929dafcf090d05938154eb20ce02559e696310a647643275a64c2278c9dd8e71442c5e32dc77a87f095c14c2bbe5f98931e627604 SHA512 29033d6e780d81ca762cb69d571c1fa8608f7e84564600d1f7a92141acecf9d7c770e7ff6dcac8f98701af4c6aec3874634eba0af0e92fc2b98ce99c5550c14d
+EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c2135f3cb448e735b7b8814dd213a0618bd0848df2cf7f57a34d83ebce1d7c2d0e761df6c3b8c430c3775c6fbd863a3701698 SHA512 1b918474fda9c92b81bc734f7d01f15fa31f5f8db9153a4aff4b330bb76ec64bb00eb3b3f4799ca2a3defb978fd2a39a952171f17007ca17b0b5502b2b1e10ec
+EBUILD trash-cli-0.16.12.29.ebuild 494 BLAKE2B 106963754651c7a7f4a7de148cd7e915a689acb1b098cbd0f61837291ee8a358c6b9ac41a20660f8bde03a8b35828ae27bf551c54939c0e44c6cb4b36a96e469 SHA512 40718d5e6b630a88fa1f98cb4ed9ed5723307e7d9166e0997cd4a68b198f83dffecc0e1a64072c752aa5b9f11e4ad5873052759fde43a2ea709fbeaa425db401
+EBUILD trash-cli-0.17.1.14.ebuild 493 BLAKE2B d476b75c962c9d0ad6d4669d6e33e1cac49c9c0f07bf312056c95904680c8283dff32447b46124373cea281fe5a16705e7f9bdd6633078ff560e3eb4deece57b SHA512 3dadfbdf10c4754158f42f303c71ce8e0e8e42d2067d2f5c1fb6c091dda4a34a5c09fa5a7159541ff15c64050e5b2dd3619b95517ea271047bd70b732e983b00
+MISC metadata.xml 1055 BLAKE2B c7e57fbc12a894309c39b66e7abab9eea69c884d30aad28d064510c1e50b015482f68cbbcdecbd03fda171966a279e283e5cdcbe7c1c182d3f5b65c6a3d51ba0 SHA512 47b92ad1a6799b37f2e4317f7fdd7ec4d597f07d4d77a4fa67eb5d48791eab30f1ca81da3610602fb5e15d9518deca19886493d8c29ec16ba003ea5af48e304a
diff --git a/app-misc/trash-cli/metadata.xml b/app-misc/trash-cli/metadata.xml
new file mode 100644
index 000000000000..123a854abc78
--- /dev/null
+++ b/app-misc/trash-cli/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>alex_y_xu@yahoo.ca</email>
+ <name>Alex Xu</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>sito@andreafrancia.it</email>
+ <name>Andrea Francia</name>
+ </maintainer>
+ <changelog>https://github.com/andreafrancia/trash-cli/commits/master</changelog>
+ <doc lang="en">https://github.com/andreafrancia/trash-cli/blob/master/README.txt</doc>
+ <bugs-to>https://github.com/andreafrancia/trash-cli/issues</bugs-to>
+ <remote-id type="github">andreafrancia/trash-cli</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ Trash-cli trashes files recording the original path, deletion date, and
+ permissions. It uses the same trashcan of KDE, GNOME, and XFCE, but you can
+ call it from the command line (and scripts).
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild b/app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild
new file mode 100644
index 000000000000..50e07cff312f
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.12.9.14-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli"
+SRC_URI="https://github.com/andreafrancia/${PN}/tarball/${PV} ->
+ ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/trash-cli/trash-cli-0.16.12.29.ebuild b/app-misc/trash-cli/trash-cli-0.16.12.29.ebuild
new file mode 100644
index 000000000000..ef6a13324634
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.16.12.29.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli"
+SRC_URI="https://github.com/andreafrancia/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14.ebuild
new file mode 100644
index 000000000000..faa9656ed80c
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.17.1.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli"
+SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/ttyload-0.5.3 b/app-misc/ttyload-0.5.3
deleted file mode 100644
index b7e3b9442d3a..000000000000
--- a/app-misc/ttyload-0.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=color-coded graph of load averages over time
-EAPI=6
-HOMEPAGE=http://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.daveltd.com/src/util/ttyload/ttyload-0.5.3.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=29f67ff335ecbb1087f0b11f03b5c612
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
new file mode 100644
index 000000000000..1a6e497ed4c9
--- /dev/null
+++ b/app-misc/ttyload/Manifest
@@ -0,0 +1,3 @@
+DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
+EBUILD ttyload-0.5.3.ebuild 715 BLAKE2B 4124a559f5873aae5105b0d5b8695ddd7d7ef0d076487eb88fe4ad8ee876accf04dc6c06579e50f372b938a1ce065b8f6c481f306470cc425c482ccfbbba9160 SHA512 c29bee509b9788891adb4971439cc2333a3f3856f1063aef12036314e33e4e2ec946ef20d7bd2f692ecb74c68e7211572f3d80e60e682fa0b57847047d4234c4
+MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/metadata.xml b/app-misc/ttyload/metadata.xml
new file mode 100644
index 000000000000..94248608af4d
--- /dev/null
+++ b/app-misc/ttyload/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/ttyload/ttyload-0.5.3.ebuild b/app-misc/ttyload/ttyload-0.5.3.ebuild
new file mode 100644
index 000000000000..0ef762b01215
--- /dev/null
+++ b/app-misc/ttyload/ttyload-0.5.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="color-coded graph of load averages over time"
+HOMEPAGE="http://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
+SRC_URI="http://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="sys-libs/ncurses:0="
+
+RESTRICT="test"
+
+DOCS=( BUGS HISTORY LICENSE README.md TODO )
+
+src_prepare() {
+ default
+ sed -i '10i#include <time.h>' "${PN}.h" || die
+ sed -i -e "s#make#$\(MAKE\)#" Makefile || die
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/ttyrec-1.0.8-r2 b/app-misc/ttyrec-1.0.8-r2
deleted file mode 100644
index fc509215b61d..000000000000
--- a/app-misc/ttyrec-1.0.8-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=ttyrec provides tools to record and replay a terminal session
-EAPI=6
-HOMEPAGE=http://0xcc.net/ttyrec/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://0xcc.net/ttyrec/ttyrec-1.0.8.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbada4df07e268fd90a7a9703d6294b8
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
new file mode 100644
index 000000000000..2772de9aa2e2
--- /dev/null
+++ b/app-misc/ttyrec/Manifest
@@ -0,0 +1,4 @@
+AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
+DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
+EBUILD ttyrec-1.0.8-r2.ebuild 687 BLAKE2B 8283817ca58b4b79230360b6894944325ae092f85e9fd9d94dc27b0700b1328290ff852837ca52046f1182d8d42b830113a9df84502a20ed4ff2b584df08a99a SHA512 9917bed3418ac6638c3e3714f0452b3249afa277fbe39550928692cfe778f2e0bbe43424cafbb2096f5ca45b4c9b4513afdc5b8acc492ea62b918cc76fc99003
+MISC metadata.xml 575 BLAKE2B cbadaa7de1bd014a8b4d0fdce081ec4f078febf7a0884639762f714fadab3adbf6603475b331a2a07a17c0934ab0f5262bfd1191b5face6a252f7d4de8d06054 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
new file mode 100644
index 000000000000..34687d9b8b7a
--- /dev/null
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
@@ -0,0 +1,19 @@
+--- a/Makefile 2017-08-26 11:47:02.981266309 +0200
++++ b/Makefile 2017-08-26 14:33:47.161600445 +0200
+@@ -10,13 +10,13 @@
+ all: $(TARGET)
+
+ ttyrec: ttyrec.o io.o
+- $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
+
+ ttyplay: ttyplay.o io.o
+- $(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
+
+ ttytime: ttytime.o io.o
+- $(CC) $(CFLAGS) -o ttytime ttytime.o io.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
+
+ clean:
+ rm -f *.o $(TARGET) ttyrecord *~
diff --git a/app-misc/ttyrec/metadata.xml b/app-misc/ttyrec/metadata.xml
new file mode 100644
index 000000000000..a7bed5c50932
--- /dev/null
+++ b/app-misc/ttyrec/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <longdescription>
+ ttyrec is a tty recorder. Recorded data can be played back with the
+ included ttyplay command. ttyrec is just a derivative of script
+ command for recording timing information with microsecond accuracy as
+ well. It can record emacs -nw, vi, lynx, or any programs running on
+ tty.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
new file mode 100644
index 000000000000..bd0fe694547e
--- /dev/null
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="ttyrec provides tools to record and replay a terminal session"
+HOMEPAGE="http://0xcc.net/ttyrec/"
+SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+PATCHES=( "${FILESDIR}/${P}-flags.patch" )
+
+src_compile() {
+ # Bug 106530
+ [[ ${CHOST} != *-darwin* ]] && append-cppflags -DSVR4 -D_XOPEN_SOURCE=500
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin tty{rec,play,time}
+ doman *.1
+ einstalldocs
+}
diff --git a/app-misc/ttysnoop-0.12d b/app-misc/ttysnoop-0.12d
deleted file mode 100644
index 778b993928d0..000000000000
--- a/app-misc/ttysnoop-0.12d
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Tool to snoop on login tty's through another tty-device or pseudo-tty
-EAPI=4
-HOMEPAGE=http://sysd.org/stas/node/35
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://sysd.org/stas/files/active/0/ttysnoop-0.12d.k26.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f59d67df9bc4aa8817ae2fb4be32498
diff --git a/app-misc/ttysnoop/Manifest b/app-misc/ttysnoop/Manifest
new file mode 100644
index 000000000000..b95c4b4f26bb
--- /dev/null
+++ b/app-misc/ttysnoop/Manifest
@@ -0,0 +1,5 @@
+AUX pinkbyte_masking.patch 1028 BLAKE2B 8aaeb707d1ff8ec5325bfd27636fdcfdb78d486b8f9c1213ee0578762017468748239adc54d7f1c27f1feb8f076137bddc701ef4f1356f965b25b158ef7c9a0c SHA512 a4adede6ceeea84ccf760805fb4f7044fa06fcc00291556bcaf61b8be81256d10751e3efd7e35c8b26897d98878da6dc17d526cd335aee5bb91762cd129225f1
+AUX ttysnoop-makefile.patch 1004 BLAKE2B b0233a65382023260cb78d095be0ca298c2d43365f9488fd3c6f255acca10d3f9c9ffd2d9e3af5f711baa86da8932fac5b19909dd7437a1a049a95c226bf6ca2 SHA512 f5e8f5764ecfd7174646801650f63ed5608dd5ce1d5e321419ff5318946ed03b61f2e25108d9d5c9dbce95eb4b788c74543cc57b0ba57d430e6ddc519e73321d
+DIST ttysnoop-0.12d.k26.tar.gz 9376 BLAKE2B 114c260de72c4909b97fb47d3ec8b22cf2406df433f708299098df7a7b1315ada8babd81c62ae3a12775fb2393c6548d24457df85523663223960390bb2891c1 SHA512 9ac90ce08e170442718ca4871b7cb569acd8a594e63a56a6889ff0852be93a6ae8e7a212ba1064e74286043dad5a27af5d8588cb3b1ea297db4bf7fa10c66665
+EBUILD ttysnoop-0.12d.ebuild 834 BLAKE2B cfcada90e6fa406289464b3cb4dc658ac3fc83beb0de26e49da40d62a025bdedd92564186bb3a3f27d7d0ff82181b39227a6edacf5fea40d6508dc8ffd5e2591 SHA512 c7672eafd3450c4e8f7cb1d089f33064400b4075d78d49d9a11aca68e61e45bb4de75fd6ff7709d80f98f0024c1981405275031a6bc79dd6ad1cb082df0c273f
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/ttysnoop/files/pinkbyte_masking.patch b/app-misc/ttysnoop/files/pinkbyte_masking.patch
new file mode 100644
index 000000000000..a0539c239b04
--- /dev/null
+++ b/app-misc/ttysnoop/files/pinkbyte_masking.patch
@@ -0,0 +1,41 @@
+--- ttysnoops.c 2009-08-13 17:11:30.705202250 +0400
++++ ttysnoops.c 2009-08-13 17:17:29.989201055 +0400
+@@ -18,6 +18,7 @@
+ v0.12d 8-4-98 Carl Declerck - updated #includes a bit
+ k26 28-5-00 Vinicius Anselmo - added sound alert (demoniac) created by Stas
+ k26 31-5-04 Vinicius Anselmo - updated for unix98 pty support
++ k26 13-8-09 Pinkbyte - deleted fucking sound alert and "bye bye" message ;)
+ */
+
+ #include <sys/types.h>
+@@ -502,22 +503,6 @@
+ struct utmp utmp;
+ int ptyfd, servfd, len, n, sel, susp = 0;
+
+- /* demoniac begin */
+-
+- StopHandle();
+-
+- if (InitSound()) /* play if we can */
+- {
+- DoSound(466, SLEN); // A#4
+- DoSound(622, SLEN); // D#5
+- DoSound(784, SLEN); // G5
+- DoSound(932, SLEN*2); // A#5
+- DoSound(784, SLEN); // G5
+- DoSound(932, SLEN*3); // A#5
+- }
+-
+- /* demoniac end */
+-
+ if (!isatty(STDIN_FILENO))
+ errorf ("stdin is not a tty\n");
+
+@@ -660,7 +645,6 @@
+ {
+ if ((n = read(ptyfd, buff, BUFF_SIZE)) < 1)
+ {
+- errorf ("bye bye\n");
+ exit (0);
+ }
+
diff --git a/app-misc/ttysnoop/files/ttysnoop-makefile.patch b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
new file mode 100644
index 000000000000..54d04dd40a29
--- /dev/null
+++ b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
@@ -0,0 +1,36 @@
+--- Makefile 2004-06-07 04:27:40.000000000 +0400
++++ Makefile 2011-07-21 11:50:22.580167326 +0400
+@@ -11,7 +11,7 @@
+
+ # For shadow support
+
+-CCOPTS = -O2 -DSHADOW_PWD
++CCOPTS = -DSHADOW_PWD
+ LIBS = -lcrypt
+ #LIBS = -lshadow
+
+@@ -24,19 +24,19 @@
+ all: ttysnoops ttysnoop
+
+ ttysnoops: $(SERVEROBJS)
+- $(CC) $(SERVEROBJS) -o ttysnoops $(LIBS)
++ $(CC) $(SERVEROBJS) -o ttysnoops $(LDFLAGS) $(LIBS)
+
+ ttysnoop: $(CLIENTOBJS)
+- $(CC) $(CLIENTOBJS) -o ttysnoop $(LIBS)
++ $(CC) $(CLIENTOBJS) -o ttysnoop $(LDFLAGS) $(LIBS)
+
+ ttysnoops.o: $(SERVERSRCS) $(INCLUDES)
+- $(CC) $(CCOPTS) -c -o ttysnoops.o $(SERVERSRCS)
++ $(CC) $(CCOPTS) $(CFLAGS) -c -o ttysnoops.o $(SERVERSRCS)
+
+ ttysnoop.o: $(CLIENTSRCS) $(INCLUDES)
+- $(CC) $(CCOPTS) -c -o ttysnoop.o $(CLIENTSRCS)
++ $(CC) $(CCOPTS) $(CFLAGS) -c -o ttysnoop.o $(CLIENTSRCS)
+
+ common.o: common.c common.h
+- $(CC) $(CCOPTS) -c -o common.o common.c
++ $(CC) $(CCOPTS) $(CFLAGS) -c -o common.o common.c
+
+ clean:
+ rm -f *.o core ttysnoop ttysnoops
diff --git a/app-misc/ttysnoop/metadata.xml b/app-misc/ttysnoop/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/app-misc/ttysnoop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
new file mode 100644
index 000000000000..f458720b20b4
--- /dev/null
+++ b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+MY_P="${P}.k26"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool to snoop on login tty's through another tty-device or pseudo-tty"
+HOMEPAGE="http://sysd.org/stas/node/35"
+SRC_URI="http://sysd.org/stas/files/active/0/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="README snooptab.dist"
+
+src_prepare(){
+ epatch "${FILESDIR}"/pinkbyte_masking.patch
+ epatch "${FILESDIR}"/"${PN}"-makefile.patch
+}
+
+src_compile(){
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dodir /var/spool/ttysnoop
+ fperms o= /var/spool/ttysnoop
+ dodoc ${DOCS}
+ dosbin ttysnoop
+ dosbin ttysnoops
+ doman ttysnoop.8
+ insinto /etc
+ newins snooptab.dist snooptab
+}
diff --git a/app-misc/unfoo-1.0.8 b/app-misc/unfoo-1.0.8
deleted file mode 100644
index 4eaee4c34af8..000000000000
--- a/app-misc/unfoo-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=test? ( || ( app-arch/bzip2 app-arch/lbzip2[symlink] app-arch/pbzip2[symlink] ) || ( app-arch/gzip app-arch/pigz[symlink] ) app-arch/p7zip || ( app-arch/rar app-arch/unrar ) app-arch/unace app-arch/unzip app-arch/xz-utils )
-DESCRIPTION=A simple bash driven frontend to simplify decompression of files
-EAPI=6
-HOMEPAGE=http://obsoleet.org/code/unfoo
-IUSE=+minimal test
-KEYWORDS=amd64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!minimal? ( || ( app-arch/bzip2 app-arch/lbzip2[symlink] app-arch/pbzip2[symlink] ) || ( app-arch/gzip app-arch/pigz[symlink] ) app-arch/p7zip || ( app-arch/rar app-arch/unrar ) app-arch/unace app-arch/unzip app-arch/xz-utils )
-SLOT=0
-SRC_URI=https://github.com/jlec/unfoo/archive/v1.0.8.tar.gz -> unfoo-1.0.8.tar.gz
-_md5_=9cabfccf2f1312f19c39cb40453553d7
diff --git a/app-misc/unfoo/Manifest b/app-misc/unfoo/Manifest
new file mode 100644
index 000000000000..0278827a85a9
--- /dev/null
+++ b/app-misc/unfoo/Manifest
@@ -0,0 +1,3 @@
+DIST unfoo-1.0.8.tar.gz 31862 BLAKE2B adba517a24a1fde7e1733b10a0c69d1ee5b0827adfadf89a7073366f77bfa2439413c1ce682d9a6d24f8b7b0402f409c84754f75dd5ee31c03ab51ffe3918f81 SHA512 b4a2489ca4ae5a81feacc57aa7c9c6437e3fbb0cec997d1b5e182e9ea7e19c13998968f23094e78908e6d41e699d50a1353ae475ec32146c63298eff06182281
+EBUILD unfoo-1.0.8.ebuild 1257 BLAKE2B df7a151daa8ebc3ac5ec29489ff9852d9efcd76d5f9b654b3f96ee1e6f2df545cf4cf7851ae37c4f6175d3bdd1e197ec3070ba3609281ea0e39b0c352adf1b00 SHA512 482c1a29dd5d23ce398495b0838257d4ffa41e4a48ee1fbb616e7c590e83a7d5309d23f211263af966f7e7699e52a651698530cf7f502c560bf4ff7c1bdba4b1
+MISC metadata.xml 443 BLAKE2B df80de233a6c7d23093b4770b2f4064c389ae85837b7a405a1b3132c42bd050ea99b6ff922d75d118e616c011191f4d708a0080b094aa40e938fcefb556f6f14 SHA512 d51afbee4941d3a6d5239b983e2beec524d9991c67131f691cf0f424b4ab5e798405fe89f7d8019c912a4e54413bf38f611bbb1574c4cef809440d7a1a60ee3e
diff --git a/app-misc/unfoo/metadata.xml b/app-misc/unfoo/metadata.xml
new file mode 100644
index 000000000000..ef237e78bfe9
--- /dev/null
+++ b/app-misc/unfoo/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <use>
+ <flag name="minimal">Do not install all support archive binaries</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">jlec/unfoo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/unfoo/unfoo-1.0.8.ebuild b/app-misc/unfoo/unfoo-1.0.8.ebuild
new file mode 100644
index 000000000000..cc38a96c3784
--- /dev/null
+++ b/app-misc/unfoo/unfoo-1.0.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple bash driven frontend to simplify decompression of files"
+HOMEPAGE="http://obsoleet.org/code/unfoo"
+SRC_URI="https://github.com/jlec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+IUSE="+minimal test"
+
+COMMON_DEPS="
+ || (
+ app-arch/bzip2
+ app-arch/lbzip2[symlink]
+ app-arch/pbzip2[symlink] )
+ || (
+ app-arch/gzip
+ app-arch/pigz[symlink] )
+ app-arch/p7zip
+ || (
+ app-arch/rar
+ app-arch/unrar )
+ app-arch/unace
+ app-arch/unzip
+ app-arch/xz-utils"
+RDEPEND="!minimal? ( ${COMMON_DEPS} )"
+DEPEND="test? ( ${COMMON_DEPS} )"
+
+src_compile() { :; }
+
+src_install() {
+ dodoc README*
+ dobin ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ echo
+ elog "unfoo can handle far more than just .tar*, but it requires some"
+ elog "optional packages to do so. For a list, either consult the source"
+ elog "(less /usr/bin/unfoo), or see http://obsoleet.org/code/unfoo"
+ elog "To get full support please use USE=-minimal"
+ elif [[ ${REPLACING_VERSIONS} < 1.0.7 ]]; then
+ elog "To get full support please use USE=-minimal"
+ fi
+}
diff --git a/app-misc/uptimed-0.4.0-r1 b/app-misc/uptimed-0.4.0-r1
deleted file mode 100644
index 02327a51c7a5..000000000000
--- a/app-misc/uptimed-0.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
-EAPI=6
-HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.0.tar.gz -> uptimed-0.4.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c63d0a80460956f78db08e214ae61f28
diff --git a/app-misc/uptimed-0.4.1 b/app-misc/uptimed-0.4.1
deleted file mode 100644
index 35189404cc86..000000000000
--- a/app-misc/uptimed-0.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
-EAPI=6
-HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.1.tar.gz -> uptimed-0.4.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=e374062b41985df8ea666b2f0507e809
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
new file mode 100644
index 000000000000..5703d06c92ed
--- /dev/null
+++ b/app-misc/uptimed/Manifest
@@ -0,0 +1,7 @@
+AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b741cbe20ad9af32aefa52566fe99dedc31abf30c3f74d74ced97ce094f07203b1473bc79d9ee2546e2 SHA512 8a9e054b2ae3f5479504b0d466a96687f5be2c5d1d8fda740597ca21d8854b4ba4bc8576f8f903392e1b3c7564e3e9e80eb39f30f5a8df0b228d1bdae04725f0
+AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
+DIST uptimed-0.4.0.tar.gz 55026 BLAKE2B 9f66f3cda4181c01e686896a8560ecab7bb7f3ed9cdaeaee840a589137188d8629ba414e436a99b212d386b8d3319ce88ccb8867c78335b015ed65a179154621 SHA512 918cd9e065d5005daf5062f14dffb725cb6d6764aa571fd45d63de3f7349b910cbae0dedc832f9bfb52a42caea90e8aec8390685baaf0718fec827240e517900
+DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
+EBUILD uptimed-0.4.0-r1.ebuild 1476 BLAKE2B f402e24dc3b229c10007464807ecc8427aeb078745dfd82e333884455a333a81a4bef074cb4c723d52f280a0f82f7de8edaa706cf04cbda1e070a2e9444cbeeb SHA512 cd97c3611a7e5d9f87364c703f811fb2b790239f5c4db0998ab7468d218de6c16a33c5ce0ad8529cc50f00b8efa354c194e1bcfca1daa842a7110402024f328b
+EBUILD uptimed-0.4.1.ebuild 1421 BLAKE2B 363b45ddcb148a2e56c6629be1f0eca7c2a8e28964a5422ec1de992eea1823bf786508b80f82e587111811b11e6b4daebd43ca61d2d1444756e9e6a3ef9c6a27 SHA512 51401b8ed326a61d1bb2bb7acf22666ecc901a675c7756120bfce1091d058d280fbf66c891bb2da1082b54405a3b257de677e7f14942f0e96098e81b1daff266
+MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/files/uptimed.init-r1 b/app-misc/uptimed/files/uptimed.init-r1
new file mode 100644
index 000000000000..96564d8ee541
--- /dev/null
+++ b/app-misc/uptimed/files/uptimed.init-r1
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="uptimed - a daemon to record uptime records"
+pidfile="/run/uptimed.pid"
+command="/usr/sbin/uptimed"
+command_user="uptimed"
+
+# The uptimed daemon can create its own PID file, but it doesn't know
+# how to drop privileges. On the other hand, if we run it as a
+# restricted user under start-stop-daemon, the PID file it creates
+# will therefore be owned by a non-root user, and that poses a
+# security risk. To avoid the issue entirely, we run the daemon in the
+# foreground, and then use command_background=true to let OpenRC
+# handle the PID file.
+command_args="-f"
+command_background="true"
diff --git a/app-misc/uptimed/files/uptimed.service b/app-misc/uptimed/files/uptimed.service
new file mode 100644
index 000000000000..531c41570216
--- /dev/null
+++ b/app-misc/uptimed/files/uptimed.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Uptime record tracking daemon
+Documentation=man:uptimed(8) man:uprecords(1)
+
+[Service]
+ExecStartPre=/usr/sbin/uptimed -b
+ExecStart=/usr/sbin/uptimed -f
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/uptimed/metadata.xml b/app-misc/uptimed/metadata.xml
new file mode 100644
index 000000000000..bb0ec8b1e524
--- /dev/null
+++ b/app-misc/uptimed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rpodgorny/uptimed</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..2fbdfafd16b3
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils user systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="static-libs"
+
+pkg_setup() {
+ enewgroup uptimed
+ enewuser uptimed -1 -1 -1 uptimed
+}
+
+src_prepare() {
+ default
+ # respect DESTDIR
+ sed -i -e 's|-d \(/var/spool.*\)$|-d $(DESTDIR)\1|' Makefile.am || die
+ # fix configure.ac for >=automake-1.13 (bug #467582)
+ sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+ default
+ prune_libtool_files --all
+ keepdir /var/spool/uptimed
+ fowners uptimed:uptimed /var/spool/uptimed
+ newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ einfo "Fixing permissions in /var/spool/${PN}"
+ chown -R uptimed:uptimed /var/spool/${PN}
+ echo
+ elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+ elog "or systemctl start uptimed (for systemd)"
+ elog "To view your uptime records, use the command 'uprecords'."
+ echo
+}
diff --git a/app-misc/uptimed/uptimed-0.4.1.ebuild b/app-misc/uptimed/uptimed-0.4.1.ebuild
new file mode 100644
index 000000000000..498d1fc64756
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools user systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+pkg_setup() {
+ enewgroup uptimed
+ enewuser uptimed -1 -1 -1 uptimed
+}
+
+src_prepare() {
+ default
+ # fix configure.ac for >=automake-1.13 (bug #467582)
+ sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+ default
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+ keepdir /var/spool/uptimed
+ fowners uptimed:uptimed /var/spool/uptimed
+ newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ einfo "Fixing permissions in /var/spool/${PN}"
+ chown -R uptimed:uptimed /var/spool/${PN}
+ echo
+ elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+ elog "or systemctl start uptimed (for systemd)"
+ elog "To view your uptime records, use the command 'uprecords'."
+ echo
+}
diff --git a/app-misc/utimer-0.4-r1 b/app-misc/utimer-0.4-r1
deleted file mode 100644
index 8d992b4dbe43..000000000000
--- a/app-misc/utimer-0.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 dev-util/intltool
-DESCRIPTION=A command line timer and stopwatch
-EAPI=6
-HOMEPAGE=http://utimer.codealpha.net/utimer
-IUSE=debug nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://utimer.codealpha.net/dl.php?file=utimer-0.4.tar.gz -> utimer-0.4.tar.gz
-_md5_=762c7da7b7d2e255a164e4d8fa1933b1
diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
new file mode 100644
index 000000000000..b36dc0526895
--- /dev/null
+++ b/app-misc/utimer/Manifest
@@ -0,0 +1,3 @@
+DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
+EBUILD utimer-0.4-r1.ebuild 665 BLAKE2B 6e2bfbf7a9d0f1aab60a8d5b69d1ea3727729a8b26c8e36f951da2315c86f890db1d3318f8369d1fd7b270c5911985da1c4acf24769025b83c6ba67701c1f786 SHA512 3a03b5be2a019b9319e16f903da9bafccb920a4d9cf8ad4a7ca9396d79adbba9fee1801c0abfcaf11389c8bb17b9d2e6500bd652c98e15e6c680b4d9529e3a23
+MISC metadata.xml 454 BLAKE2B 466406ecad60f09bb43e8bf07c58b6f04194f5241c29ba16afc59ffb08b03c5db848bf53162df6131a07d0c366d614cc4f069c532174f32fc9bd85248c9a3c26 SHA512 18656dd0b9eccf673087a5b3fd055453e4c28bbb407b19f275a654527e5a8f2d75f5fbf4f44b1575579c5809b2acf0e99a170946d91374c74125390e813c3751
diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
new file mode 100644
index 000000000000..e6007f541a76
--- /dev/null
+++ b/app-misc/utimer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>lavi.kfir@gmail.com</email>
+<name>Kfir Lavi</name>
+</maintainer>
+<maintainer type="person">
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/utimer/utimer-0.4-r1.ebuild b/app-misc/utimer/utimer-0.4-r1.ebuild
new file mode 100644
index 000000000000..bf5c8f9fd36b
--- /dev/null
+++ b/app-misc/utimer/utimer-0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A command line timer and stopwatch"
+HOMEPAGE="http://utimer.codealpha.net/utimer"
+SRC_URI="http://utimer.codealpha.net/dl.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug nls"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-util/intltool"
+
+RDEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+ local myconf=( --enable-debug=no )
+ use debug || myconf=( --enable-debug=yes )
+ econf "${myconf[@]}" $(use_enable nls)
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+ einstalldocs
+}
diff --git a/app-misc/vcontrold-0.98.5 b/app-misc/vcontrold-0.98.5
deleted file mode 100644
index 1370ff9d5ad3..000000000000
--- a/app-misc/vcontrold-0.98.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 man? ( dev-python/docutils ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Daemon for communication with Viessmann Vito heatings
-EAPI=6
-HOMEPAGE=https://github.com/openv/vcontrold/
-IUSE=+man +vclient vsim
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2
-SLOT=0
-SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.5.tar.gz -> vcontrold-0.98.5.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85030ade1f83c41f9a9abda824df2b0f
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
new file mode 100644
index 000000000000..ced57c0e75bf
--- /dev/null
+++ b/app-misc/vcontrold/Manifest
@@ -0,0 +1,4 @@
+AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
+DIST vcontrold-0.98.5.tar.gz 86684 BLAKE2B 07ed2c932b9f1c03410cbd6c23cfbfb7bf1aeaff027f597fb6f05a6b61c647f229a75b5a87d893a66c6b8e917595083d193c5da8585c6b9546d12c5867ca1a1b SHA512 b94dbb09ffe274e0a0a0ac4948365ed3213f221dbc00ed2b2adec2ac5a632e293686d62a07575454b3d11b1b8e4e058625a067461996dd720c2f84066d57e60e
+EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
+MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/files/vcontrold b/app-misc/vcontrold/files/vcontrold
new file mode 100644
index 000000000000..369dc6d8e642
--- /dev/null
+++ b/app-misc/vcontrold/files/vcontrold
@@ -0,0 +1,5 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/vcontrold"
diff --git a/app-misc/vcontrold/metadata.xml b/app-misc/vcontrold/metadata.xml
new file mode 100644
index 000000000000..b718f1673eb4
--- /dev/null
+++ b/app-misc/vcontrold/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>tobias.leupold@gmx.de</email>
+ <name>Tobias Leupold</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+ Vcontrold can be used for communication with Viessmann Vito heatings
+ through their Optolink interface using an optical communication device
+ (which can be built quite cheap and easily, cf. the homepage of the
+ "OpenV" project).
+</longdescription>
+<use>
+ <flag name="man">Build the manpages</flag>
+ <flag name="vclient">
+ Build the vclient helper program to talk to vcontrold
+ </flag>
+ <flag name="vsim">
+ Build the vsim helper program (simulates the heating's answers, for
+ development and debugging)
+ </flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/vcontrold/vcontrold-0.98.5.ebuild b/app-misc/vcontrold/vcontrold-0.98.5.ebuild
new file mode 100644
index 000000000000..e5b4f78672d4
--- /dev/null
+++ b/app-misc/vcontrold/vcontrold-0.98.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
+HOMEPAGE="https://github.com/openv/vcontrold/"
+SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man +vclient vsim"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ man? ( dev-python/docutils )"
+
+src_prepare() {
+ sed "s/@VERSION@/${PV}/" "src/version.h.in" \
+ > "src/version.h" || die "Setting version failed"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DMANPAGES="$(usex man)"
+ -DVCLIENT="$(usex vclient)"
+ -DVSIM="$(usex vsim)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ doinitd "${FILESDIR}/vcontrold"
+ insinto /etc/vcontrold/
+ doins -r xml
+}
diff --git a/app-misc/vcp-2.2-r2 b/app-misc/vcp-2.2-r2
deleted file mode 100644
index 0ba57b9f98f5..000000000000
--- a/app-misc/vcp-2.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=Copy files/directories in a curses interface
-EAPI=6
-HOMEPAGE=http://members.iinet.net.au/~lynx/vcp/
-KEYWORDS=amd64 ~arm ~arm64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://members.iinet.net.au/~lynx/vcp/vcp-2.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50e60fff09504a600513aafd573b4f48
diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
new file mode 100644
index 000000000000..b8b3d340d759
--- /dev/null
+++ b/app-misc/vcp/Manifest
@@ -0,0 +1,4 @@
+AUX vcp-2.2-tinfo.patch 310 BLAKE2B 31ebbb498615f7eb9c0472cd99f85643a44a84e94dcae7d671044cc2aea9001e31e925506958db397516074f45d62ea834b28302448d158ab87038c0208244b8 SHA512 886a20474591c5fee3c70bf978977b2bc19f362dc38898eff6f44365b6edebd2eaff1cf09befc764163d32f0f2a84a80d032647266af0e7fb343b9ee6c5f82d3
+DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
+EBUILD vcp-2.2-r2.ebuild 741 BLAKE2B df056f3fcae3294a5b77a485f758ae3c9a253368541777c08178d5e2adf0d8b59cbe65134cab5f63cd1907b0a055dd5bdf3a3d62c9f591856df91cad2f51c02d SHA512 69900311ae134a54d5eddb17898e90e3921cfbd3c72845d09df88c0e81b1690f9645143c8c09c75813d6589d5d8242a2c4202ba63278d5b3cf5d673f0e80a29c
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vcp/files/vcp-2.2-tinfo.patch b/app-misc/vcp/files/vcp-2.2-tinfo.patch
new file mode 100644
index 000000000000..715b6f1a6584
--- /dev/null
+++ b/app-misc/vcp/files/vcp-2.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ OBJS = main.o copyall.o copy.o screen.o log.o path.o misc.o color.o
+
+ all: $(OBJS)
+- $(CC) $(CFLAGS) -o vcp $(OBJS) -lcurses
++ $(CC) $(CFLAGS) $(LDFLAGS) -o vcp $(OBJS) $(shell $(PKG_CONFIG) --libs ncurses)
+
+ .c.o:
+ $(CC) $(CFLAGS) -c -I/usr/include/ -o $@ $<
diff --git a/app-misc/vcp/metadata.xml b/app-misc/vcp/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/vcp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
new file mode 100644
index 000000000000..c53cc103faa9
--- /dev/null
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Copy files/directories in a curses interface"
+HOMEPAGE="http://members.iinet.net.au/~lynx/vcp/"
+SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+DOCS=( Changelog README INSTALL )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-tinfo.patch
+)
+
+src_compile() {
+ filter-lfs-flags
+ emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ insinto /etc
+ newins "${PN}.conf.sample" "${PN}.conf"
+ einstalldocs
+}
diff --git a/app-misc/vifm-0.9 b/app-misc/vifm-0.9
deleted file mode 100644
index ba1b9465a623..000000000000
--- a/app-misc/vifm-0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Console file manager with vi(m)-like keybindings
-EAPI=6
-HOMEPAGE=https://vifm.info/
-IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/vifm/vifm-0.9.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb
-_md5_=8310628ac064005885a930ab6fce46cc
diff --git a/app-misc/vifm-0.9.1 b/app-misc/vifm-0.9.1
deleted file mode 100644
index 0a243a2f4049..000000000000
--- a/app-misc/vifm-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Console file manager with vi(m)-like keybindings
-EAPI=6
-HOMEPAGE=https://vifm.info/
-IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/vifm/vifm-0.9.1.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=62649f0264fc11e4e4fa7e314000c9d1
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
new file mode 100644
index 000000000000..92b2b13d0190
--- /dev/null
+++ b/app-misc/vifm/Manifest
@@ -0,0 +1,6 @@
+AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
+DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
+DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
+EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
+EBUILD vifm-0.9.ebuild 1975 BLAKE2B 109e5ed44f8297e6283ecb2443bbb89f8c4da9170e8e5d5cdb50d26d8bb44db2b84461c06cd8a5711271f76d405f5522a31ae86218a98878ee6083ded5bfd6d5 SHA512 f6e33c5c1fbc1990c0aab33a191071ae79de4ffc7034d1c8c0feab3ab0cb32476c8a826983319c677191f8e3713db7a5be6ff657a5cd85873fb33a8ef6250bb5
+MISC metadata.xml 1315 BLAKE2B 2e31d51dfdd5df5d84edbb860f2b981513490ff58d776d3c75669e961da6d8eceb55e9957f7ad65e428645e0d39983fbde164940a679f5931ade43397fcec1ea SHA512 09965612c0613b994ea1b5780fdf79d4eddbb2464225132375390980b8bf29e2a2622dc3dd2c43a8650d1f90f888db9d30e9449e37b0311d1abc1cf9fca82812
diff --git a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
new file mode 100644
index 000000000000..40d41dcc8f17
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
@@ -0,0 +1,60 @@
+From 8196704a5dafa4c8e194f1643728ed45b4b55df6 Mon Sep 17 00:00:00 2001
+From: xaizek <xaizek@posteo.net>
+Date: Mon, 9 Apr 2018 19:31:06 +0300
+Subject: [PATCH] fix ncurses linking
+
+---
+ THANKS | 2 ++
+ configure | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index e708f4d3..faab4f8a 100644
+--- a/THANKS
++++ b/THANKS
+@@ -25,6 +25,7 @@ c02y
+ Carl Mueller (carlmuller)
+ Carlos Pita
+ Charles Kauffman
++Chema Alonso Josa (nimiux)
+ Christian Fillion (cfillion)
+ Christian Herdtweck
+ Christoph (informationen)
+@@ -128,6 +129,7 @@ Richard Benson
+ Robert Sarkozi
+ Roger Bongers
+ Ross Hadden (rosshadden)
++Ruslan Osmanov (rosmanov)
+ Russell Urquhart
+ SanLe
+ santhoshr
+diff --git a/configure b/configure
+index 0054dbde..a3c9bd43 100755
+--- a/configure
++++ b/configure
+@@ -8707,7 +8707,7 @@ return curs_set ();
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' tinfo; do
++for ac_lib in '' tinfow; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+diff --git a/configure.ac b/configure.ac
+index 61b3ed5d..65e550a2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -437,7 +437,7 @@ AC_CHECK_LIB(${curses_lib_name}, initscr,
+ CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
+ fi
+ ncurses_found=yes]
+- AC_SEARCH_LIBS([curs_set], [tinfo],,
++ AC_SEARCH_LIBS([curs_set], [tinfow],,
+ AC_MSG_ERROR(could not find a library providing curs_set)))
+ dnl If libncursesw is not found on OS X, check for libncurses. On OS X it has
+ dnl support of wide characters.
+--
+2.16.1
+
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
new file mode 100644
index 000000000000..564dc1b9462e
--- /dev/null
+++ b/app-misc/vifm/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>nimiux@gentoo.org</email>
+ <name>Chema Alonso</name>
+ </maintainer>
+ <longdescription>
+ Vifm is a ncurses based file manager with vi like keybindings. If you
+ use vi, vifm gives you complete keyboard control over your files without
+ having to learn a new set of commands.
+ </longdescription>
+ <longdescription lang="es">
+ Vifm es un gestor de ficheros basado en ncurses con definiciones de
+ teclas estilo vi. Si utiliza vi, vifm le ofrece un control completo
+ de sus ficheros utilizando el teclado si tener que aprender un nuevo
+ conjunto de órdenes.
+ </longdescription>
+ <use>
+ <flag name="developer">Enable features of interest to developers</flag>
+ <flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
+ <flag name="gtk">Use gtk+ to determine mimetypes</flag>
+ <flag name="magic">Use libmagic to determine mimetypes</flag>
+ <flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
+ <flag name="vim-syntax">Pulls in related vim syntax scripts</flag>
+ <flag name="X">Add support for X11</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">vifm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
new file mode 100644
index 000000000000..6d971785f150
--- /dev/null
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vim-doc versionator xdg-utils
+
+MY_P=$(replace_version_separator 4 '-' ${PF})
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+ >=sys-libs/ncurses-5.9-r3:0
+ magic? ( sys-apps/file )
+ gtk? ( x11-libs/gtk+:2 )
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="
+ ${DEPEND}
+ vim? ( || ( app-editors/vim app-editors/gvim ) )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-ncurses-linking.patch"
+)
+
+DOCS="AUTHORS FAQ NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
+ || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable developer) \
+ $(use_enable extended-keys) \
+ $(use_with magic libmagic) \
+ $(use_with gtk) \
+ $(use_with X X11)
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ${DOCS}
+
+ if use vim; then
+ local t
+ for t in app plugin; do
+ insinto /usr/share/vim/vimfiles/"${t}"
+ doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
+ done
+ fi
+
+ if use vim-syntax; then
+ local t
+ for t in ftdetect ftplugin syntax; do
+ insinto /usr/share/vim/vimfiles/"${t}"
+ doins "${S}"/data/vim/"${t}"/"${PN}".vim
+ done
+ fi
+}
+
+src_test() {
+ emake check
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ if use vim; then
+ update_vim_helptags
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "You don't need to copy or link any files for"
+ elog " the vim plugin and documentation to work anymore."
+ elog "If you copied any vifm files to ~/.vim/ manually"
+ elog " in earlier vifm versions, please delete them."
+ fi
+ elog
+ elog "To use vim in vifm to view the documentation"
+ elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+ elog
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ use vim && update_vim_helptags
+}
diff --git a/app-misc/vifm/vifm-0.9.ebuild b/app-misc/vifm/vifm-0.9.ebuild
new file mode 100644
index 000000000000..9621f77ac8d4
--- /dev/null
+++ b/app-misc/vifm/vifm-0.9.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vim-doc versionator
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+ >=sys-libs/ncurses-5.9-r3:0
+ magic? ( sys-apps/file )
+ gtk? ( x11-libs/gtk+:2 )
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="
+ ${DEPEND}
+ vim? ( || ( app-editors/vim app-editors/gvim ) )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS="AUTHORS FAQ NEWS README TODO"
+
+src_prepare() {
+ sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
+ || die
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable developer) \
+ $(use_enable extended-keys) \
+ $(use_with magic libmagic) \
+ $(use_with gtk) \
+ $(use_with X X11)
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ${DOCS}
+
+ if use vim; then
+ local t
+ for t in app plugin; do
+ insinto /usr/share/vim/vimfiles/"${t}"
+ doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
+ done
+ fi
+
+ if use vim-syntax; then
+ local t
+ for t in ftdetect ftplugin syntax; do
+ insinto /usr/share/vim/vimfiles/"${t}"
+ doins "${S}"/data/vim/"${t}"/"${PN}".vim
+ done
+ fi
+}
+
+src_test() {
+ emake check
+}
+
+pkg_postinst() {
+ if use vim; then
+ update_vim_helptags
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "You don't need to copy or link any files for"
+ elog " the vim plugin and documentation to work anymore."
+ elog "If you copied any vifm files to ~/.vim/ manually"
+ elog " in earlier vifm versions, please delete them."
+ fi
+ elog
+ elog "To use vim in vifm to view the documentation"
+ elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+ elog
+ fi
+}
+
+pkg_postrm() {
+ use vim && update_vim_helptags
+}
diff --git a/app-misc/vit-1.2-r1 b/app-misc/vit-1.2-r1
deleted file mode 100644
index 251ca9eaaa26..000000000000
--- a/app-misc/vit-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-misc/task dev-lang/perl dev-perl/Curses
-DESCRIPTION=Perl/Curses front-end for Taskwarrior (app-misc/task)
-EAPI=5
-HOMEPAGE=http://tasktools.org/projects/vit.html
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-misc/task dev-lang/perl dev-perl/Curses
-RESTRICT=test
-SLOT=0
-SRC_URI=https://git.tasktools.org/EX/vit/archive/v1.2.tar.gz -> vit-1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=014367f7a4bc70c8a06a6e2723ce9ae1
diff --git a/app-misc/vit-9999 b/app-misc/vit-9999
deleted file mode 100644
index 02a746c553a3..000000000000
--- a/app-misc/vit-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-misc/task dev-lang/perl dev-perl/Curses >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Perl/Curses front-end for Taskwarrior (app-misc/task)
-EAPI=5
-HOMEPAGE=http://tasktools.org/projects/vit.html
-LICENSE=GPL-3
-RDEPEND=app-misc/task dev-lang/perl dev-perl/Curses
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f5fcf3182e3712357024e181d2beffea
diff --git a/app-misc/vit/Manifest b/app-misc/vit/Manifest
new file mode 100644
index 000000000000..66219c431fbf
--- /dev/null
+++ b/app-misc/vit/Manifest
@@ -0,0 +1,6 @@
+AUX vit-allow-nonsudo-install.patch 978 BLAKE2B 93603afb84034316c807508a8169ae4ffc22b46b311722fb730fe89c9f934d8a440432e0fb5dc8f2f056dab48d8074ef9ecb67b976a076f0eb670381128d2ffe SHA512 11b50594481934dd33a5f59bf04c61c7a347e517f1f0408be8c7463731490bf49c0c823c4b9ac1b951ac1f7e66d531f2d0df74ee12c3d25f47a299a2b16da628
+AUX vit-fix-man-installs.patch 739 BLAKE2B 6f3a212752a83735bca279ee3bea2dbdba2aafdb72cf6c79a2b65eb0feff6fd25718c91a30ca150e1ff929ab0e880433557ae18be84c7dab291be8ff879c6090 SHA512 9b1795690ba090bf0487b35da28f3563f5bae4a8133d85f469a9b0104a84588d8948b98a2935b83c9c321fcffcf5a44027500eb87a736de4b254374f142dc572
+DIST vit-1.2.tar.gz 49346 BLAKE2B e1dd7cae2db714e20c60dbff704575e185ae2d844f3be8934dbfe0ca8e754b64ad3bd800407ab31024b81cf06f32fde61914e008e1c5d2d4293ee4060785321f SHA512 dc0e09fbec7d77817b044f437e42108a9282e387698dfe23bfbe50a083b708d5d3b432ce9b1fdb93f3fef495af2a5f16107351557a4bb9184c7c762b264f0ed3
+EBUILD vit-1.2-r1.ebuild 822 BLAKE2B a0244c198407ca65e85527eaaaeb8843caf012030c68a30122fa78a4179cdd4c1d8ffaeb1ff2699f17f998948d979b24ed9f7e18500f9fd50b74525fb22f4ce3 SHA512 63fb6e2ebe073435260630f4be7b85e4afdb4d05e3546652487fb39ba9820af1a9c33b31b02d8a5432fad35b20a53c2bfd3bc09a387c370b1f14a9286899ff32
+EBUILD vit-9999.ebuild 777 BLAKE2B 92a1e9527219aa76b892b16c47bdab7be2f5f5d89972a636259094aec5e8075e88e1ba5b01e9fa5b7dd48d34990934c0471219d21e13984a4946eb980751189a SHA512 e8779d3179f4eea0344b238860c8019447d91d38fc4b0d2173a55c70e29027c3d0fef5cd246faaed173535531f465e5bd967d8bd78fcd83676f5174229926ae3
+MISC metadata.xml 457 BLAKE2B ecdaf5aed8c19a4c345d5a747ccf842026cdd7623e76be162c0429f03f289ab69d1cb7d3270e5adb6020bb079c8453e3459dabfd24e3a58d715810a515c625bd SHA512 fa9700903506961b1d8c62718b77a7219c811b99039d8f73d331dcd448f2df8fa638f152b956c9f41e2989007402860a1a036427d38d754a4385cebfa7a5b5c7
diff --git a/app-misc/vit/files/vit-allow-nonsudo-install.patch b/app-misc/vit/files/vit-allow-nonsudo-install.patch
new file mode 100644
index 000000000000..0f5626cce379
--- /dev/null
+++ b/app-misc/vit/files/vit-allow-nonsudo-install.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile.in b/Makefile.in
+index 87abf5b..66d6acd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,6 +7,8 @@ VERSION=@VERSION@
+ TASK=@TASK@
+ PERL=@PERL@
+ CLEAR=@CLEAR@
++SUDO=@SUDO@
++SUDO=sudo
+
+ .PHONY : install
+
+@@ -28,14 +30,14 @@ build:
+ chmod 755 vit
+
+ install:
+- sudo mkdir -p @prefix@/bin
+- sudo cp vit @prefix@/bin/vit
+- sudo mkdir -p @prefix@/man/man1
+- sudo cp vit.1 @prefix@/man/man1/
+- sudo mkdir -p @prefix@/man/man5
+- sudo cp vitrc.5 @prefix@/man/man5/
+- sudo mkdir -p @prefix@/etc/
+- sudo cp commands @prefix@/etc/vit-commands
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/bin
++ $(SUDO) cp vit $(DESTDIR)@prefix@/bin/vit
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man1
++ $(SUDO) cp vit.1 $(DESTDIR)@prefix@/man/man1/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man5
++ $(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/man/man5/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/etc/
++ $(SUDO) cp commands $(DESTDIR)@prefix@/etc/vit-commands
+
+ autoconf:
+ @make -f .makefile autoconf
diff --git a/app-misc/vit/files/vit-fix-man-installs.patch b/app-misc/vit/files/vit-fix-man-installs.patch
new file mode 100644
index 000000000000..9d13fbb287a0
--- /dev/null
+++ b/app-misc/vit/files/vit-fix-man-installs.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.in b/Makefile.in
+index 66d6acd..c167ae4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -32,10 +32,10 @@ build:
+ install:
+ $(SUDO) mkdir -p $(DESTDIR)@prefix@/bin
+ $(SUDO) cp vit $(DESTDIR)@prefix@/bin/vit
+- $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man1
+- $(SUDO) cp vit.1 $(DESTDIR)@prefix@/man/man1/
+- $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man5
+- $(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/man/man5/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/share/man/man1
++ $(SUDO) cp vit.1 $(DESTDIR)@prefix@/share/man/man1/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/share/man/man5
++ $(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/share/man/man5/
+ $(SUDO) mkdir -p $(DESTDIR)@prefix@/etc/
+ $(SUDO) cp commands $(DESTDIR)@prefix@/etc/vit-commands
+
diff --git a/app-misc/vit/metadata.xml b/app-misc/vit/metadata.xml
new file mode 100644
index 000000000000..48a67656210f
--- /dev/null
+++ b/app-misc/vit/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>nerdboy@gentoo.org</email>
+ <name>Stephen Arnold</name>
+</maintainer>
+<longdescription lang="en">
+ A perl/Curses front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
+ provides a fullscreen terminal window with modes and commands
+ modeled after the vi editor.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/vit/vit-1.2-r1.ebuild b/app-misc/vit/vit-1.2-r1.ebuild
new file mode 100644
index 000000000000..6ab360543842
--- /dev/null
+++ b/app-misc/vit/vit-1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
+HOMEPAGE="http://tasktools.org/projects/vit.html"
+SRC_URI="https://git.tasktools.org/EX/vit/archive/v1.2.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+ app-misc/task
+ dev-lang/perl
+ dev-perl/Curses"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # missing the extra .makefile for extra targets (like test)
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
+ "${FILESDIR}"/${PN}-fix-man-installs.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" SUDO="" install
+ dodoc AUTHORS README CHANGES
+ doman vit.1 vitrc.5
+
+ rm -rf "${ED}"/usr/man
+}
diff --git a/app-misc/vit/vit-9999.ebuild b/app-misc/vit/vit-9999.ebuild
new file mode 100644
index 000000000000..0cd795e26a94
--- /dev/null
+++ b/app-misc/vit/vit-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils git-r3
+
+DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
+HOMEPAGE="http://tasktools.org/projects/vit.html"
+
+EGIT_REPO_URI="https://git.tasktools.org/EX/vit.git"
+if [[ ${PV} = 9999* ]]; then
+ KEYWORDS=""
+else
+ EGIT_COMMIT=v${PV}
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ app-misc/task
+ dev-lang/perl
+ dev-perl/Curses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
+ "${FILESDIR}"/${PN}-fix-man-installs.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" SUDO="" install
+ dodoc AUTHORS README CHANGES
+ doman vit.1 vitrc.5
+
+ rm -rf "${ED}"/usr/man
+}
diff --git a/app-misc/vittk-1.3 b/app-misc/vittk-1.3
deleted file mode 100644
index 87f91e58fe5e..000000000000
--- a/app-misc/vittk-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/tcl:0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A front end for Taskwarrior (app-misc/task)
-EAPI=4
-HOMEPAGE=http://taskwarrior.org/wiki/taskwarrior/Vittk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0 dev-lang/tk:0 app-misc/task
-SLOT=0
-SRC_URI=http://taskwarrior.org/download/vittk-1.3.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=173f2af3e9bbc18b750fda7b89697b02
diff --git a/app-misc/vittk/Manifest b/app-misc/vittk/Manifest
new file mode 100644
index 000000000000..b629c53fb17c
--- /dev/null
+++ b/app-misc/vittk/Manifest
@@ -0,0 +1,6 @@
+AUX vittk-1.1.1-dirs.patch 2540 BLAKE2B c2b55384c213960476d89aed85b9041d74842eaca87d22e9d1bce2e0e0949c61591b3af82fdf66c38398789536af27dbeb87d5d95a441f85893cb6eef92dd192 SHA512 bd2a32082d22c52d7f5db18795189562b06c7b5178276b2034e5614419879c2c32056a77991ce33f397c743630b38457effb0ed2ad6e5b53c4c160a0f83727ac
+AUX vittk-1.3-configure.patch 831 BLAKE2B 3838841a6ee8bb4fb686a7372740f5759340f8254e54b69986f7c3080e183994dce35408df8067863fad1b36948675b0b9634f7eb9a98c2b9029a313dfefee0f SHA512 b5a8032822643125687e8282b3fb775fb008156674c19485f70ab1aee9424cdc73294978f67f0b04c0dd765903d9be032a807086233b9a5dd1fdd7a04cabb5d8
+AUX vittk-1.3-makefile.patch 3750 BLAKE2B 6f4e3037a785d9b0bc71b7a4aa2eecba5e63805f96fd80668cb1b96d2e598997d698ba0acf0d9739cb6c401af60727e91fd5129567a0377a875ff123da590c73 SHA512 c8d59448ae96f3c25925aa707778079da52ec343e84252c4e03c2f9b6d8a3bffca21f03e0798c9ab7d66994bd6adcd3eded9ae4126ca8cef2a7f8a825e9a1c89
+DIST vittk-1.3.tar.gz 71921 BLAKE2B eae3aeee88f1986fd654307b0bae4fd7bc9c3f86312f82bb3776ee5f8d36b45489aee386762a9c8a1ef67766d75aa01086ab50a4743bffe14910411ccb19dd88 SHA512 feda4eda7780a5a2a51acbc4c4d47ba5b88c3c01c82ae8715e7822700843e0d7de365b786554db59f7e40dbdff6f6bb0083a2126b1b082586504d8d16112af6d
+EBUILD vittk-1.3.ebuild 671 BLAKE2B 60f3e2aee3ba0b8dd88f7026aaa1a6459b04b3632875cf0efc4c1d0ac7cb54d02254abe906d9efb6e17dde1e7b5e3fbede004ea906461a6f31dc638a7fcb18c0 SHA512 d27e434a6fa1d108dcbfd49660b1b9a1728ff5df48fd14bbfa3a307b843f3c550981e94ad521e15537a714e7eb9dff62014658f7c2f88aa3c9fecb2b752dc8d8
+MISC metadata.xml 390 BLAKE2B 894900220ccdd655ebedc4eb754233116f9bd0a4a41ef17f3da95f93a665c9435ce507b0dcf4b27f618b1e7fef88de95fdb47e0f2eeac9bcae969d27928d431a SHA512 22fe059e8490e1a6a338aafcd8257cd121e629ed52cd80a95b8a57061e8ca2b0483f6fe4a5926e85b533ff60d96dfe8d7c6ec31bfc91f2b621ca0ecc86462b79
diff --git a/app-misc/vittk/files/vittk-1.1.1-dirs.patch b/app-misc/vittk/files/vittk-1.1.1-dirs.patch
new file mode 100644
index 000000000000..050d1bcded01
--- /dev/null
+++ b/app-misc/vittk/files/vittk-1.1.1-dirs.patch
@@ -0,0 +1,66 @@
+--- vittk-1.1.1.orig/vittk.in
++++ vittk-1.1.1/vittk.in
+@@ -17,7 +17,7 @@
+
+ set font "@FONT@"
+ set system_task_cmd "ls"
+-set system_vittkrc "@prefix@/etc/vittkrc"
++set system_vittkrc "@sysconfdir@/vittkrc"
+ set task "@TASK@"
+ set ver "@VER@"
+
+@@ -28,8 +28,8 @@
+ source ./vars.tcl
+ set auto_path ". $auto_path"
+ } else {
+- source @prefix@/lib/vittk/vars.tcl
+- set auto_path "@prefix@/lib/vittk $auto_path"
++ source @libdir@/vittk/vars.tcl
++ set auto_path "@libdir@/vittk $auto_path"
+ }
+
+ ReadRcs
+--- vittk-1.1.1.orig/vittk.man.in
++++ vittk-1.1.1/vittk.man.in
+@@ -89,13 +89,13 @@
+ in Taskwarrior. At this time, various other parts of the VITtk color
+ scheme can only be changed system-wide by altering the variables in
+ .br
+-@prefix@/lib/vars.tcl.
++@libdir@/vars.tcl.
+ .SH FONTS
+ VITtk requires a fixed-width font for it's columns to align correctly.
+ The default font "TkFixedFont" has been set to ensure this happens. You can
+ use other Xwindows fonts by using the -fn option or your ~/.vittkrc file.
+ Instructions for browsing fixed-width fonts can be found in the
+-/usr/local/share/doc/vittk/Fonts file. If you specify a proportional font
++@docdir@/Fonts file. If you specify a proportional font
+ (you will get a warning message and) the VITtk display will probably look very
+ bad, and if you use the -fn option with the name of a non-existent font then
+ VITtk will default the default tcl/tkfont (e.g. "fixed") without warning.
+@@ -103,20 +103,20 @@
+ fixed-width, so care should be taken to specify an existing font.
+ .SH SETTINGS
+ There are a number of settings which allow you to "remotely control"
+-many aspects of VITtk. Refer to the @prefix@/etc/vittkrc file for more
++many aspects of VITtk. Refer to the @sysconfdir@/vittkrc file for more
+ information. There are also some settings which are hard-coded
+ (e.g. how long feedback messages are displayed.) These could be
+-changed sytem-wide by editing @prefix@/lib/vars.tcl.
++changed sytem-wide by editing @libdir@/vars.tcl.
+ .SH FILES
+-@prefix@/etc/vittkrc - the system-wide VITtk configuration file
++@sysconfdir@/vittkrc - the system-wide VITtk configuration file
+ .br
+ ~/.vittkrc - user VITtk configuration file
+ .br
+ /tmp/vittk-$USER.log - VITtk actions log
+ .br
+-@prefix@/share/doc/vittk/README - quick start and more information
++@docdir@/README - quick start and more information
+ .br
+-@prefix@/share/doc/vittk/Tutorial - a brief VITtk tutoral
++@docdir@/Tutorial - a brief VITtk tutoral
+ .SH CREDITS & COPYRIGHT
+ VITtk was written by Steve Rader (C) 2011.
+
diff --git a/app-misc/vittk/files/vittk-1.3-configure.patch b/app-misc/vittk/files/vittk-1.3-configure.patch
new file mode 100644
index 000000000000..b45464bfb8b1
--- /dev/null
+++ b/app-misc/vittk/files/vittk-1.3-configure.patch
@@ -0,0 +1,32 @@
+--- vittk-1.3/configure.in.orig
++++ vittk-1.3/configure.in
+@@ -14,11 +14,11 @@
+ fi
+ AC_SUBST(BASH)
+
+-AC_PATH_PROG(WISH, wish, NOT_FOUND)
+-if test "$WISH" = "NOT_FOUND"; then
+- AC_MSG_ERROR([can not continue: wish not found])
++AC_PATH_PROG(TCLSH, tclsh, NOT_FOUND)
++if test "$TCLSH" = "NOT_FOUND"; then
++ AC_MSG_ERROR([can not continue: tclsh not found])
+ fi
+-AC_SUBST(WISH)
++AC_SUBST(TCLSH)
+
+ AC_PATH_PROG(TASK, task, NOT_FOUND)
+ if test "$TASK" = "NOT_FOUND"; then
+@@ -30,12 +30,9 @@
+ AC_SUBST(FONT)
+
+ AC_OUTPUT(task-startstop task-undo Makefile vittk.man vittk)
+-chmod 755 task-startstop
+-chmod 755 task-undo
+-chmod 755 vittk
+
+ echo creating ./tclIndex
+-echo "auto_mkindex `pwd`; exit" | $WISH
++echo "auto_mkindex `pwd`; exit" | $TCLSH
+
+ echo "./configure is done"
+ echo "now do \"sudo make install\" or \"make install\""
diff --git a/app-misc/vittk/files/vittk-1.3-makefile.patch b/app-misc/vittk/files/vittk-1.3-makefile.patch
new file mode 100644
index 000000000000..a7148fdf64dc
--- /dev/null
+++ b/app-misc/vittk/files/vittk-1.3-makefile.patch
@@ -0,0 +1,87 @@
+--- vittk-1.3/Makefile.in.orig
++++ vittk-1.3/Makefile.in
+@@ -10,45 +10,45 @@
+ @echo "usage: make install"
+
+ install:
+- @if [ ! -d @prefix@/bin ]; then \
+- echo mkdir -p @prefix@/bin ; \
+- mkdir -p @prefix@/bin ; \
++ @if [ ! -d $(DESTDIR)@prefix@/bin ]; then \
++ echo mkdir -p $(DESTDIR)@prefix@/bin ; \
++ mkdir -p $(DESTDIR)@prefix@/bin ; \
+ fi
+- @if [ ! -d @prefix@/share/doc/vittk ]; then \
+- echo mkdir -p @prefix@/share/doc/vittk ; \
+- mkdir -p @prefix@/share/doc/vittk ; \
++ @if [ ! -d $(DESTDIR)@docdir@ ]; then \
++ echo mkdir -p $(DESTDIR)@docdir@ ; \
++ mkdir -p $(DESTDIR)@docdir@ ; \
+ fi
+- @echo installing documentation in @prefix@/share/doc/vittk
+- @$(INSTALL) -c -m 644 Caveats @prefix@/share/doc/vittk/Caveats
+- @$(INSTALL) -c -m 644 Fonts @prefix@/share/doc/vittk/Fonts
+- @$(INSTALL) -c -m 644 README @prefix@/share/doc/vittk/README
+- @$(INSTALL) -c -m 644 Tutorial @prefix@/share/doc/vittk/Tutorial
+- @$(INSTALL) -c -m 644 WhatsNew @prefix@/share/doc/vittk/WhatsNew
+- @echo installing man page in @prefix@/man/man1
+- @if [ ! -d @prefix@/man/man1 ]; then \
+- echo mkdir -p @prefix@/man/man1 ; \
+- mkdir -p @prefix@/man/man1 ; \
++ @echo installing documentation in $(DESTDIR)@docdir@
++ @$(INSTALL) -c -m 644 Caveats $(DESTDIR)@docdir@/Caveats
++ @$(INSTALL) -c -m 644 Fonts $(DESTDIR)@docdir@/Fonts
++ @$(INSTALL) -c -m 644 README $(DESTDIR)@docdir@/README
++ @$(INSTALL) -c -m 644 Tutorial $(DESTDIR)@docdir@/Tutorial
++ @$(INSTALL) -c -m 644 WhatsNew $(DESTDIR)@docdir@/WhatsNew
++ @echo installing man page in $(DESTDIR)@mandir@/man1
++ @if [ ! -d $(DESTDIR)@mandir@/man1 ]; then \
++ echo mkdir -p $(DESTDIR)@mandir@/man1 ; \
++ mkdir -p $(DESTDIR)@mandir@/man1 ; \
+ fi
+- @$(INSTALL) -c -m 644 vittk.man @prefix@/man/man1/vittk.1
+- @echo installing vittkrc in @prefix@/etc
+- @$(INSTALL) -c -m 644 vittkrc @prefix@/etc/vittkrc
+- @if [ ! -d @prefix@/libexec/vittk ]; then \
+- echo mkdir -p @prefix@/libexec/vittk ; \
+- mkdir -p @prefix@/libexec/vittk ; \
++ @$(INSTALL) -c -m 644 vittk.man $(DESTDIR)@mandir@/man1/vittk.1
++ @echo installing vittkrc in $(DESTDIR)@sysconfdir@
++ @$(INSTALL) -c -m 644 vittkrc $(DESTDIR)@sysconfdir@/vittkrc
++ @if [ ! -d $(DESTDIR)@prefix@/libexec/vittk ]; then \
++ echo mkdir -p $(DESTDIR)@prefix@/libexec/vittk ; \
++ mkdir -p $(DESTDIR)@prefix@/libexec/vittk ; \
+ fi
+- @echo installing task-startstop in @prefix@/libexec/vittk
+- @$(INSTALL) -c -m 755 task-startstop @prefix@/libexec/vittk/task-startstop
+- @echo installing task-undo in @prefix@/libexec/vittk
+- @$(INSTALL) -c -m 755 task-undo @prefix@/libexec/vittk/task-undo
+- @echo installing .tcl files and tclIndex in @prefix@/lib/vittk
+- @if [ ! -d @prefix@/lib/vittk ]; then \
+- echo mkdir -p @prefix@/lib/vittk ; \
+- mkdir -p @prefix@/lib/vittk ; \
++ @echo installing task-startstop in $(DESTDIR)@prefix@/libexec/vittk
++ @$(INSTALL) -c -m 755 task-startstop $(DESTDIR)@prefix@/libexec/vittk/task-startstop
++ @echo installing task-undo in $(DESTDIR)@prefix@/libexec/vittk
++ @$(INSTALL) -c -m 755 task-undo $(DESTDIR)@prefix@/libexec/vittk/task-undo
++ @echo installing .tcl files and tclIndex in $(DESTDIR)@libdir@/vittk
++ @if [ ! -d $(DESTDIR)@libdir@/vittk ]; then \
++ echo mkdir -p $(DESTDIR)@libdir@/vittk ; \
++ mkdir -p $(DESTDIR)@libdir@/vittk ; \
+ fi
+- @cp *.tcl @prefix@/lib/vittk
+- @cp tclIndex @prefix@/lib/vittk
+- @echo installing vittk in @prefix@/bin
+- @$(INSTALL) -c -m 755 vittk @prefix@/bin/vittk
++ @cp *.tcl $(DESTDIR)@libdir@/vittk
++ @cp tclIndex $(DESTDIR)@libdir@/vittk
++ @echo installing vittk in $(DESTDIR)@prefix@/bin
++ @$(INSTALL) -c -m 755 vittk $(DESTDIR)@prefix@/bin/vittk
+
+ autoconf:
+ @make -f .makefile autoconf
+@@ -61,3 +61,4 @@
+ dogfood:
+ @make -f .makefile dogfood
+
++check:
diff --git a/app-misc/vittk/metadata.xml b/app-misc/vittk/metadata.xml
new file mode 100644
index 000000000000..3667ce87214b
--- /dev/null
+++ b/app-misc/vittk/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription lang="en">
+ A comprehensive front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
+ provides a fullscreen emulated terminal window with modes and commands
+ modeled after the vi editor.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/vittk/vittk-1.3.ebuild b/app-misc/vittk/vittk-1.3.ebuild
new file mode 100644
index 000000000000..c53b6a2df04a
--- /dev/null
+++ b/app-misc/vittk/vittk-1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="A front end for Taskwarrior (app-misc/task)"
+HOMEPAGE="http://taskwarrior.org/wiki/taskwarrior/Vittk"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/tcl:0"
+RDEPEND="${DEPEND}
+ dev-lang/tk:0
+ app-misc/task"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-configure.patch \
+ "${FILESDIR}"/${P}-makefile.patch \
+ "${FILESDIR}"/${PN}-1.1.1-dirs.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
diff --git a/app-misc/vlock-2.2.3-r1 b/app-misc/vlock-2.2.3-r1
deleted file mode 100644
index e873d24f300e..000000000000
--- a/app-misc/vlock-2.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=pam? ( sys-libs/pam ) test? ( dev-util/cunit )
-DESCRIPTION=A console screen locker
-EAPI=6
-HOMEPAGE=https://github.com/WorMzy/vlock
-IUSE=pam test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=https://github.com/WorMzy/vlock/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vlock-2.2.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd3bb7ad2b280401afb59f0d9adb893a
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
new file mode 100644
index 000000000000..d9f289f7e4dc
--- /dev/null
+++ b/app-misc/vlock/Manifest
@@ -0,0 +1,5 @@
+AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
+AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
+DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
+EBUILD vlock-2.2.3-r1.ebuild 1228 BLAKE2B 0c971292f98b419f7d19829cecef6c791cd1532b251647553ae3a38518984fc697e3506c09a4f70e5ac14feca914db70ccdecf9f0848f25a4f2a345429289070 SHA512 3854598d34688ea6c42b72504209d8760b49cff414e84c6ba2a34e7431bccb391e99d2649774716ac3fe5daa0810cfe516964f362e4efdf37ce03a46ea173d27
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/files/vlock-2.2.2-asneeded.patch b/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
new file mode 100644
index 000000000000..cb4c3f42422b
--- /dev/null
+++ b/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
@@ -0,0 +1,11 @@
+--- a/tests/Makefile 2008-10-16 13:48:37.000000000 +0200
++++ b/tests/Makefile 2008-10-16 13:48:53.000000000 +0200
+@@ -16,7 +16,7 @@
+ TEST_SOURCES = $(TESTED_SOURCES:%=test_%)
+ TEST_OBJECTS = $(TEST_SOURCES:.c=.o)
+
+-vlock-test : override LDFLAGS+=-lcunit
++vlock-test : override LDLIBS+=-lcunit
+ vlock-test: vlock-test.o $(TEST_OBJECTS) $(TESTED_OBJECTS)
+
+ vlock-test.o: $(TEST_SOURCES:.c=.h)
diff --git a/app-misc/vlock/files/vlock-2.2.2-test_process.patch b/app-misc/vlock/files/vlock-2.2.2-test_process.patch
new file mode 100644
index 000000000000..a725e9a5a851
--- /dev/null
+++ b/app-misc/vlock/files/vlock-2.2.2-test_process.patch
@@ -0,0 +1,28 @@
+--- a/tests/test_process.c 2008-10-16 14:10:16.000000000 +0200
++++ b/tests/test_process.c 2008-10-16 14:11:26.000000000 +0200
+@@ -12,6 +12,7 @@
+
+ #include "test_process.h"
+
++/* Dustin Polke: This test is flaky, sometimes it passes, sometimes not... Thus exclude it
+ void test_wait_for_death(void)
+ {
+ pid_t pid = fork();
+@@ -25,6 +26,7 @@
+ CU_ASSERT(!wait_for_death(pid, 0, 2000));
+ CU_ASSERT(wait_for_death(pid, 0, 20000));
+ }
++*/
+
+ void test_ensure_death(void)
+ {
+@@ -137,7 +139,8 @@
+ }
+
+ CU_TestInfo process_tests[] = {
+- { "test_wait_for_death", test_wait_for_death },
++/* Dustin Polke: This test is flaky, sometimes it passes, sometimes not... Thus exclude it
++ { "test_wait_for_death", test_wait_for_death }, */
+ { "test_ensure_death", test_ensure_death },
+ { "test_create_child_function", test_create_child_function },
+ { "test_create_child_process", test_create_child_process },
diff --git a/app-misc/vlock/metadata.xml b/app-misc/vlock/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-misc/vlock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..a824254c0335
--- /dev/null
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam toolchain-funcs user
+
+COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"
+
+DESCRIPTION="A console screen locker"
+HOMEPAGE="https://github.com/WorMzy/vlock"
+SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="pam test"
+
+RDEPEND="
+ pam? ( sys-libs/pam )"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cunit )"
+
+DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.2-asneeded.patch"
+ "${FILESDIR}/${PN}-2.2.2-test_process.patch"
+)
+
+pkg_setup() {
+ enewgroup "${PN}"
+}
+
+src_configure() {
+ local myconf="--enable-shadow"
+ use pam && myconf="--enable-pam"
+
+ # this package has handmade configure system which fails with econf...
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --libdir=/usr/$(get_libdir) \
+ ${myconf} \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ CFLAGS="${CFLAGS} -pedantic -std=gnu99" \
+ LDFLAGS="${LDFLAGS}" || die "configure failed"
+}
+
+src_install() {
+ default
+ use pam && pamd_mimic_system vlock auth
+}
diff --git a/app-misc/vzstats-0.3.2 b/app-misc/vzstats-0.3.2
deleted file mode 100644
index 5b16723f7fe6..000000000000
--- a/app-misc/vzstats-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-DESCRIPTION=OpenVZ stats collection daemon
-EAPI=5
-HOMEPAGE=http://stats.openvz.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-SLOT=0
-SRC_URI=http://download.openvz.org/utils/vzstats/0.3.2/src/vzstats-0.3.2.tar.bz2
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b5fc00b15782061c2d5b07e5233f9488
diff --git a/app-misc/vzstats-0.4 b/app-misc/vzstats-0.4
deleted file mode 100644
index 229cd360e5a9..000000000000
--- a/app-misc/vzstats-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-DESCRIPTION=OpenVZ stats collection daemon
-EAPI=5
-HOMEPAGE=http://stats.openvz.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-SLOT=0
-SRC_URI=http://download.openvz.org/utils/vzstats/0.4/src/vzstats-0.4.tar.bz2
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b5fc00b15782061c2d5b07e5233f9488
diff --git a/app-misc/vzstats-0.5.1 b/app-misc/vzstats-0.5.1
deleted file mode 100644
index a1e408ed046d..000000000000
--- a/app-misc/vzstats-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-DESCRIPTION=OpenVZ stats collection daemon
-EAPI=5
-HOMEPAGE=http://stats.openvz.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-SLOT=0
-SRC_URI=http://download.openvz.org/utils/vzstats/0.5.1/src/vzstats-0.5.1.tar.bz2
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b5fc00b15782061c2d5b07e5233f9488
diff --git a/app-misc/vzstats/Manifest b/app-misc/vzstats/Manifest
new file mode 100644
index 000000000000..294dfe3f7fc4
--- /dev/null
+++ b/app-misc/vzstats/Manifest
@@ -0,0 +1,7 @@
+DIST vzstats-0.3.2.tar.bz2 11560 BLAKE2B 88945e19719fdb1d20a5ebcb18bb1b597eae9f8ab22dfa20c28d38a572ba287fbf9ba295bc892611a63a9a02e4b08531ad764ee732ed324ba0001365337dad55 SHA512 43d7a16ff2f051c94faa00e99d6d77d34707026319c34b61e2354fb2916e06af43b73c4476d1ee98c195b43e6e8bc540d0cb09d4345286682c830cea87abff59
+DIST vzstats-0.4.tar.bz2 12187 BLAKE2B b21fa70135438cd3b33c80aeca3777226f8d6d5724cb2a8f948905aa43fe4ed8e6ed30a72bc81801a1f64209f13c1afbca45ae0e6f1193c49c1e31b1e4671e52 SHA512 6d9885ce7f5dac3d50afc5583da8f84524ba6600c1587b8df75c12c9f09a273e91482cdd52cef41773c76c8b0d1a8b957ac9f0ecb9125a81e8021e332ab237f7
+DIST vzstats-0.5.1.tar.bz2 17548 BLAKE2B 91e431ef2fae5f63fe544b9ffe87e0bcc4d53be3e38eb5e261ba4ef00ce56a7a6118ef213837f48050e2d291fb9ae8576e2aa24c1df0425ba758866f00b64d84 SHA512 ea58ba065fda6f1e1bebcdd273e231d1da46934d0c5217e1acc0a3ecb2ce5738975d3155939c6f74ba407796ae94af4ba405efdb0c808e9bbbbded48285a6663
+EBUILD vzstats-0.3.2.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
+EBUILD vzstats-0.4.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
+EBUILD vzstats-0.5.1.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
+MISC metadata.xml 767 BLAKE2B 4fc236d574509666fc9e2a364c9e675b3ce8f4d9ab7212489961aec8eeaf6c3736d26d18b8d307276d7dab7ab7fd2ae71908763a06f847a5cde6fc47a7a07f5c SHA512 e186ed96257d933a92e02fbef6efd3d584015aaecb6efa07c3f37f4d684a270d8f395b2df0445b4b847013c254018da2252169b74f2ee2f0d5989579112343b7
diff --git a/app-misc/vzstats/metadata.xml b/app-misc/vzstats/metadata.xml
new file mode 100644
index 000000000000..2217d4192394
--- /dev/null
+++ b/app-misc/vzstats/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <maintainer status="active">
+ <email>kir@openvz.org</email>
+ <name>Kir Kolyshkin</name>
+ </maintainer>
+ </upstream>
+ <longdescription>This is an OpenVZ component to gather OpenVZ usage and hardware statistics,
+ in order to improve the project.
+
+ Statistics gathered and reported include the following:
+ 1 Hardware info.
+ - CPU, disk, memory/swap, PCI devices
+ 2 Software info.
+ - host distribution, versions of OpenVZ components, kernel version
+ 3 Containers info.
+ - number of containers existing/running/using ploop/using vswap
+ - OS templates of containers
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/vzstats/vzstats-0.3.2.ebuild b/app-misc/vzstats/vzstats-0.3.2.ebuild
new file mode 100644
index 000000000000..b4f566ccc487
--- /dev/null
+++ b/app-misc/vzstats/vzstats-0.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="OpenVZ stats collection daemon"
+HOMEPAGE="http://stats.openvz.org"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ virtual/cron
+ sys-process/cronbase
+ net-misc/curl[ssl]
+ app-portage/gentoolkit
+ sys-cluster/vzctl
+ "
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake install install-cronjob DESTDIR="${D}"
+ dodoc README
+ newbashcomp bash_completion.sh vzstats
+}
diff --git a/app-misc/vzstats/vzstats-0.4.ebuild b/app-misc/vzstats/vzstats-0.4.ebuild
new file mode 100644
index 000000000000..b4f566ccc487
--- /dev/null
+++ b/app-misc/vzstats/vzstats-0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="OpenVZ stats collection daemon"
+HOMEPAGE="http://stats.openvz.org"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ virtual/cron
+ sys-process/cronbase
+ net-misc/curl[ssl]
+ app-portage/gentoolkit
+ sys-cluster/vzctl
+ "
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake install install-cronjob DESTDIR="${D}"
+ dodoc README
+ newbashcomp bash_completion.sh vzstats
+}
diff --git a/app-misc/vzstats/vzstats-0.5.1.ebuild b/app-misc/vzstats/vzstats-0.5.1.ebuild
new file mode 100644
index 000000000000..b4f566ccc487
--- /dev/null
+++ b/app-misc/vzstats/vzstats-0.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="OpenVZ stats collection daemon"
+HOMEPAGE="http://stats.openvz.org"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ virtual/cron
+ sys-process/cronbase
+ net-misc/curl[ssl]
+ app-portage/gentoolkit
+ sys-cluster/vzctl
+ "
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake install install-cronjob DESTDIR="${D}"
+ dodoc README
+ newbashcomp bash_completion.sh vzstats
+}
diff --git a/app-misc/wcd-5.2.7 b/app-misc/wcd-5.2.7
deleted file mode 100644
index 36c403d4c4f0..000000000000
--- a/app-misc/wcd-5.2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
-DESCRIPTION=Wherever Change Directory
-EAPI=5
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.2.7.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b9e68919e8252e4b5065088c09c52f6
diff --git a/app-misc/wcd-5.3.4 b/app-misc/wcd-5.3.4
deleted file mode 100644
index 787c167655ef..000000000000
--- a/app-misc/wcd-5.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
-DESCRIPTION=Wherever Change Directory
-EAPI=6
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51ceaca6b413c2028ce225b21d50b7d9
diff --git a/app-misc/wcd-6.0.1 b/app-misc/wcd-6.0.1
deleted file mode 100644
index 5df74020f153..000000000000
--- a/app-misc/wcd-6.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
-DESCRIPTION=Wherever Change Directory
-EAPI=6
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f59840e7418ddbdbe6de4c3b1064d38
diff --git a/app-misc/wcd-6.0.2 b/app-misc/wcd-6.0.2
deleted file mode 100644
index d4d597bef27a..000000000000
--- a/app-misc/wcd-6.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
-DESCRIPTION=Wherever Change Directory
-EAPI=6
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2d82b8e957dd9ecfb16f68affae149e
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
new file mode 100644
index 000000000000..c24851403f9e
--- /dev/null
+++ b/app-misc/wcd/Manifest
@@ -0,0 +1,13 @@
+AUX wcd-5.2.5-gentoo.patch 1468 BLAKE2B 4c1e0998173ca2104fef5f44e206f37c2f7685a518af162f61a6e1aa30ca5f8687bb3a5f1c8cf91279f2865016bedbe676ddf4d21f0c9a7700abaab0551e9a14 SHA512 427befe8be99ca4dc633f4c0e3cb130924027e452d87f3d9463d4edd7418f0864d6b5bd1cd3526734a55e28745db3e93a101c45255bc285c9abd324a6bd27108
+AUX wcd-5.3.4-gentoo.patch 1293 BLAKE2B e60a4da12941d78e4f94ae2e12ddbe2828dea13ebb1ad97fc54b2ec44799446d3fe464e2380086016843f13c8431c0b9d3fbbce1914bba7fb107ba1ebf93ced7 SHA512 2a5508ce61475dff6606a81df9de609d8ff270914ae1b40ffd831dee49d643afbb9654fb807ae6536531c95bfdb5f76a194bed250986b4881504b63e2fb21ddf
+AUX wcd-6.0.1-gentoo.patch 1503 BLAKE2B 0c17f6085ad12b7eccd768ac394ac7965f7fb299aaa7fc3ce2a15341dffc420321534083e253dab3ff673bbee983a063d4698121ab41e7de271de02f99dc8ebc SHA512 0d99727b6b5ae3c665d122ed84fcd3f2a57de3740564acab765cc075c7e05ff9c00e27bc0644eb6e49a7e02b56fd988921b68a5d05894f4ae77d544d6502d952
+AUX wcd-6.0.2-gentoo.patch 1476 BLAKE2B 3c94e459733592c0d90c4fca6cdad936333cdfa7f1347df5780baa667e17ece877318225f818b3cd2a488322e2b78dfec58c08969232378e359e8ca14fab1c16 SHA512 ee464b51e508e863d9cefe22179a39aeed8bafd7dfc6bb435ba1d9e01ca5e254e1121d47f50d9119684fb28d904ea5746b8f433bf52ec82bc221c7778f089f48
+DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d0385a17c6188e76975058af7370fbc393b0a9a1911b6c200f7397fcf45c4426aaa48f5a3f31a696657c444e SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e
+DIST wcd-5.3.4.tar.gz 610630 BLAKE2B f460de38b0ded0da592df31c12d8f28f890555750f972e395b5178665bdd2bf0514b258f5c2c1338e6a7699224c04153e67d088642626b5611abb9b685d305fd SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94
+DIST wcd-6.0.1.tar.gz 705577 BLAKE2B 9af2c14bae8cce50ad69b230897f2ae18c6ce899e9ed5d2f9b014ffb5b104c9fd136aa0d8a14110ae08fb1b9d4cc5f7819f42f5f23f5adf34780d16adf801790 SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e
+DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
+EBUILD wcd-5.2.7.ebuild 942 BLAKE2B 9ee88dbe9fe9bb3ab1f1810a9f4897a06e18fff8f35b21201fd2b1369592f6e22f5aee66634dc65a5244c3c7df9bb5820cc8c9190edd7ea098fa58874704e4ee SHA512 49cac153d0cb70845500bd789ba3b0927730518abec498767a4d3f9fadc6d333bebe76f72ba86f1d5fd06daaef1fbb1680fbc694649977b46de4ca8ccfe0bc0c
+EBUILD wcd-5.3.4.ebuild 1054 BLAKE2B c0beec9a9b544f6d25492cf17e2e1397ba1d0d0f554cc21c85c9811c1bf2300bec6f2be1085f927efabb48d59d05ab4f293370edebe3f27e73b0428c703bcd12 SHA512 264a5eafe29249dc3d063f4de88e0270cfbed1312e5e3d6f564cd8b1f6e6eb609df52638bbe154d121a53dc65c90df2a2da9819d9df16edc6c66ab1d487eec12
+EBUILD wcd-6.0.1.ebuild 963 BLAKE2B 365293927af0deb49ae842696e610d5e5f061ebbc888bf34f8286ec2d449a2680e63c0da50216bf56cc5718a146ce16240cb8dc97e91c5f5d1c36250ed10125d SHA512 11cdef28a30d7fc63b23e9ba423af74d3f71d9bf4dd28f468a9c4ba2c263defe0bc8b6b3440c28c12a46e9892d4e013ecd67a466067d5d651e17cc1e73b39e63
+EBUILD wcd-6.0.2.ebuild 937 BLAKE2B 203a297cca3c7da36cba1f6c2a62052c80b071dbfff23be95b0bceefe592a9dde79a039de47631eeb29e6b1cbe92eb1ec45309f06c8bab6a8252eab8bb27cacf SHA512 22b0db024a63aa5e30ca1e52771191bd7af8669ead3dfafcdbb76dd8cbbe0da4831cefb6c36f20bf16fa60f37530b444569ef704028061b3cc7f481107d4b522
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
new file mode 100644
index 000000000000..c838e131aa5f
--- /dev/null
+++ b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
@@ -0,0 +1,72 @@
+ src/Makefile | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index d4120cc..4505b8d 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -46,12 +46,12 @@ include version.mk
+
+ CC ?= gcc
+ STATIC =
+-STRIP = strip
++STRIP =
+
+ ENABLE_NLS = 1
+
+ PACKAGE = wcd
+-EXT = .exe
++EXT =
+ PROGRAM = $(PACKAGE)$(EXT)
+ BIN = $(PROGRAM)
+
+@@ -188,9 +188,9 @@ endif
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+
+ ifdef UCS
+- CURSES = ncursesw
++ CURSES = $(shell pkg-config --libs ncursesw)
+ else
+- CURSES = ncurses
++ CURSES = $(shell pkg-config --libs ncurses)
+ endif
+
+ ifdef CURSES
+@@ -201,7 +201,7 @@ endif
+
+ ifneq (,$(CURSES))
+ DEFS_CURSES = -DWCD_USECURSES
+- LIB_CURSES = -l$(CURSES)
++ LIB_CURSES = $(CURSES)
+ endif
+
+
+@@ -406,15 +406,15 @@ ifdef ASCII_TREE
+ endif
+
+ LDFLAGS_USER =
+-LDFLAGS = $(RPM_OPT_FLAGS) \
++LIBS = $(RPM_OPT_FLAGS) \
+ $(LDFLAGS_EXTRA) \
+ $(NLFLAG) \
+ $(LDFLAG_STATIC) \
+ $(LDFLAGS_USER)
+
+-LIBS = $(LIB_CURSES) \
+- $(LIB_UNISTRING) \
+- $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++ $(LIB_UNISTRING) \
++ $(LIBS_EXTRA)
+
+ DEFS_USER =
+ DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -470,7 +470,7 @@ status:
+
+ $(BIN): $(OBJS1)
+ $(MAKE) status
+- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch b/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
new file mode 100644
index 000000000000..0839bdb069d9
--- /dev/null
+++ b/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-5.3.4/src/Makefile
++++ wcd-5.3.4/src/Makefile
+@@ -46,12 +46,12 @@
+
+ CC ?= gcc
+ STATIC =
+-STRIP = strip
++STRIP =
+
+ ENABLE_NLS = 1
+
+ PACKAGE = wcd
+-EXT = .exe
++EXT =
+ PROGRAM = $(PACKAGE)$(EXT)
+ BIN = $(PROGRAM)
+
+@@ -334,9 +334,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+
+ ifdef UCS
+- CURSES = ncursesw
++ CURSES = $(shell pkg-config --libs ncursesw)
+ else
+- CURSES = ncurses
++ CURSES = $(shell pkg-config --libs ncurses)
+ endif
+
+
+@@ -366,7 +366,7 @@
+
+ ifneq (,$(CURSES))
+ DEFS_CURSES = -DWCD_USECURSES
+- LIB_CURSES = -l$(CURSES)
++ LIB_CURSES = $(CURSES)
+ ifeq (os/2,$(OS))
+ LIB_CURSES += -ltinfo
+ endif
+@@ -456,15 +456,15 @@
+ endif
+
+ LDFLAGS_USER =
+-LDFLAGS = $(RPM_OPT_FLAGS) \
++LIBS = $(RPM_OPT_FLAGS) \
+ $(LDFLAGS_EXTRA) \
+ $(NLFLAG) \
+ $(LDFLAG_STATIC) \
+ $(LDFLAGS_USER)
+
+-LIBS = $(LIB_CURSES) \
+- $(LIB_UNISTRING) \
+- $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++ $(LIB_UNISTRING) \
++ $(LIBS_EXTRA)
+
+ DEFS_USER =
+ DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -521,7 +521,7 @@
+
+ $(BIN): $(OBJS1)
+ $(MAKE) status
+- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
new file mode 100644
index 000000000000..eca95856ca33
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.1/src/Makefile
++++ wcd-6.0.1/src/Makefile
+@@ -45,12 +45,12 @@
+
+ CC ?= gcc
+ STATIC =
+-STRIP = strip
++STRIP =
+
+ ENABLE_NLS = 1
+
+ PACKAGE = wcd
+-EXT = .exe
++EXT =
+ PROGRAM = $(PACKAGE)$(EXT)
+ BIN = $(PROGRAM)
+
+@@ -329,9 +329,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+
+ ifdef UCS
+- CURSES = ncursesw
++ CURSES = $(shell pkg-config --libs ncursesw)
+ else
+- CURSES = ncurses
++ CURSES = $(shell pkg-config --libs ncurses)
+ endif
+
+
+@@ -361,7 +361,7 @@
+
+ ifneq (,$(CURSES))
+ DEFS_CURSES = -DWCD_USECURSES
+- LIB_CURSES = -l$(CURSES)
++ LIB_CURSES = $(CURSES)
+ ifeq (os/2,$(OS))
+ LIB_CURSES += -ltinfo
+ endif
+@@ -455,15 +455,15 @@
+ endif
+
+ LDFLAGS_USER =
+-LDFLAGS = $(RPM_OPT_FLAGS) \
++LIBS = $(RPM_OPT_FLAGS) \
+ $(LDFLAGS_EXTRA) \
+ $(NLFLAG) \
+ $(LDFLAG_STATIC) \
+ $(LDFLAGS_USER)
+
+-LIBS = $(LIB_CURSES) \
+- $(LIB_UNISTRING) \
+- $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++ $(LIB_UNISTRING) \
++ $(LIBS_EXTRA)
+
+ DEFS_USER =
+ DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -520,7 +520,7 @@
+
+ $(BIN): $(OBJS1)
+ $(MAKE) status
+- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
new file mode 100644
index 000000000000..ecd7c530f156
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.2/src/Makefile
++++ wcd-6.0.2/src/Makefile
+@@ -45,12 +45,12 @@
+
+ CC ?= gcc
+ STATIC =
+-STRIP = strip
++STRIP =
+
+ ENABLE_NLS = 1
+
+ PACKAGE = wcd
+-EXT = .exe
++EXT =
+ PROGRAM = $(PACKAGE)$(EXT)
+ BIN = $(PROGRAM)
+
+@@ -328,9 +328,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+
+ ifdef UCS
+- CURSES = ncursesw
++ CURSES = $(shell pkg-config --libs ncursesw)
+ else
+- CURSES = ncurses
++ CURSES = $(shell pkg-config --libs ncurses)
+ endif
+
+
+@@ -360,7 +360,7 @@
+
+ ifneq (,$(CURSES))
+ DEFS_CURSES = -DWCD_USECURSES
+- LIB_CURSES = -l$(CURSES)
++ LIB_CURSES = $(CURSES)
+ ifeq (os/2,$(OS))
+ LIB_CURSES += -ltinfo
+ endif
+@@ -458,15 +458,15 @@
+
+ LDFLAGS_USER =
+ LDFLAGS ?=
+-LDFLAGS += $(RPM_LD_FLAGS) \
++LIBS = $(RPM_LD_FLAGS) \
+ $(LDFLAGS_EXTRA) \
+ $(NLFLAG) \
+ $(LDFLAG_STATIC) \
+ $(LDFLAGS_USER)
+
+-LIBS = $(LIB_CURSES) \
+- $(LIB_UNISTRING) \
+- $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++ $(LIB_UNISTRING) \
++ $(LIBS_EXTRA)
+
+ DEFS_USER =
+ DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -523,7 +523,7 @@
+
+ $(BIN): $(OBJS1)
+ $(MAKE) status
+- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/metadata.xml b/app-misc/wcd/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/wcd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/wcd/wcd-5.2.7.ebuild b/app-misc/wcd/wcd-5.2.7.ebuild
new file mode 100644
index 000000000000..36a9d04865f5
--- /dev/null
+++ b/app-misc/wcd/wcd-5.2.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+ sys-libs/ncurses[unicode?]
+ unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+ app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"/${P}/src
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-5.2.5-gentoo.patch
+ tc-export CC
+}
+
+src_compile() {
+ local mycompile="LFS=1"
+ use nls || mycompile="${mycompile} ENABLE_NLS="
+ use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
+ emake \
+ ${mycompile}
+}
+
+src_install() {
+ local DOCS="../README.txt"
+ default
+ emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-misc/wcd/wcd-5.3.4.ebuild b/app-misc/wcd/wcd-5.3.4.ebuild
new file mode 100644
index 000000000000..01d10fdcc1d4
--- /dev/null
+++ b/app-misc/wcd/wcd-5.3.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+ sys-libs/ncurses:0=[unicode?]
+ unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+ app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"/${P}/src
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.3.4-gentoo.patch
+)
+
+src_prepare() {
+ # Required for stupid eapply function
+ pushd .. &>/dev/null || die
+ default
+ popd &>/dev/null || die
+ tc-export CC
+}
+
+src_compile() {
+ local mycompile="LFS=1"
+ use nls || mycompile="${mycompile} ENABLE_NLS="
+ use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
+ emake \
+ ${mycompile}
+}
+
+src_install() {
+ local DOCS=( ../README.txt )
+ default
+ emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-misc/wcd/wcd-6.0.1.ebuild b/app-misc/wcd/wcd-6.0.1.ebuild
new file mode 100644
index 000000000000..2cf0a5de0ec4
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+ sys-libs/ncurses:0=[unicode?]
+ unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+ app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}"/${PN}-6.0.1-gentoo.patch
+ eapply_user
+ tc-export CC
+}
+
+src_compile() {
+ local mycompile="LFS=1"
+ use nls || mycompile="${mycompile} ENABLE_NLS="
+ use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
+ emake \
+ ${mycompile}
+}
+
+src_install() {
+ local DOCS=( ../README.txt )
+ default
+ emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-misc/wcd/wcd-6.0.2.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
new file mode 100644
index 000000000000..a5b1dabb2ee3
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+ sys-libs/ncurses:0=[unicode?]
+ unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+ app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+ eapply_user
+ tc-export CC
+}
+
+src_compile() {
+ local mycompile="LFS=1"
+ use nls || mycompile+=" ENABLE_NLS="
+ use unicode && mycompile+=" UCS=1 UNINORM=1"
+ emake ${mycompile}
+}
+
+src_install() {
+ local DOCS=( ../README.txt )
+ default
+ emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-misc/webcomics-collector-0.7.3-r1 b/app-misc/webcomics-collector-0.7.3-r1
deleted file mode 100644
index 751ad3ba96b5..000000000000
--- a/app-misc/webcomics-collector-0.7.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=python script for downloading webcomics
-EAPI=5
-HOMEPAGE=http://collector.skumleren.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://collector.skumleren.net/releases/collector-0.7.3.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=adf332d3ab84d86c8831576583afc5f2
diff --git a/app-misc/webcomics-collector/Manifest b/app-misc/webcomics-collector/Manifest
new file mode 100644
index 000000000000..3e2af432d5ea
--- /dev/null
+++ b/app-misc/webcomics-collector/Manifest
@@ -0,0 +1,3 @@
+DIST collector-0.7.3.tar.bz2 66069 BLAKE2B 55b76d24856c3edd483b02618a6a48cfa8d4427ff9e4f358cd7cfd03f050e12674dac1dadcb062229cc1f574a8251445374c55f024e78926b5adf59700384d31 SHA512 6ac846550311cbfb54580bf7971ec2fdf5a0e5321eaf75a97ff1eb91367ddbbf03421855750d21547c0910be7037a989a9be5a08d19eb9556b228faaf9c90035
+EBUILD webcomics-collector-0.7.3-r1.ebuild 871 BLAKE2B 5510922548012adf3aa90bbfa81ef2d71fd9dcfe8ad008759361eda666af3f4d91f9c0ebd9a9f00dcf09484dbf8255eac7d58b34bec3a270a3f92fc7a36931df SHA512 3f4fd1afbdbdfa2753d6f201c35cfc2a373468248630c4796de6804d869f39ff8a151d4a4655ea6bc052df9f36f936fd9ddfcbe258e6cabf0d7e3eda71c77b2d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/webcomics-collector/metadata.xml b/app-misc/webcomics-collector/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/webcomics-collector/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild b/app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..dcf0f208b520
--- /dev/null
+++ b/app-misc/webcomics-collector/webcomics-collector-0.7.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="gdbm"
+
+inherit distutils-r1
+
+DESCRIPTION="python script for downloading webcomics"
+HOMEPAGE="http://collector.skumleren.net/"
+SRC_URI="http://collector.skumleren.net/releases/collector-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/collector-${PV}"
+
+DOCS=( Changelog README UPGRADE )
+
+python_install() {
+ distutils-r1_python_install
+ python_fix_shebang "${ED}"usr/share/collector
+}
+
+pkg_postinst() {
+ ewarn "If you are upgrading from an earlier version of Collector, please"
+ ewarn "read UPGRADE. This new version will not be able to use your old"
+ ewarn "archives if you do not follow the upgrade instructions!"
+}
diff --git a/app-misc/when-1.1.36 b/app-misc/when-1.1.36
deleted file mode 100644
index 30f5c15f5cde..000000000000
--- a/app-misc/when-1.1.36
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Minimalistic personal calendar program
-EAPI=6
-HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Artistic
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.36.tar.gz
-_md5_=f3ef5b6e2abb0b0003fa08df80ed1071
diff --git a/app-misc/when-1.1.37 b/app-misc/when-1.1.37
deleted file mode 100644
index ff25e5673b49..000000000000
--- a/app-misc/when-1.1.37
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Minimalistic personal calendar program
-EAPI=6
-HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Artistic
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.37.tar.gz
-_md5_=5100047634e61a44d7b4c82ed55db173
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
new file mode 100644
index 000000000000..cff2ac621d58
--- /dev/null
+++ b/app-misc/when/Manifest
@@ -0,0 +1,5 @@
+DIST when-1.1.36.tar.gz 50926 BLAKE2B 339e50db6b3c7e4867569e2a400563e9d53966904cf904044b3e7f7deee8e60872582011d90e1a685d69c4a1a5b9ffe2a727470bb09c8d6e1ca7780c9d0abce7 SHA512 04b2efbcebae79325d8410a5aa5cdf59662fe42c06229ebc91f3b7163091d305a6ba91914a2a9117d86807d5ca0c875d48679dbc3545162a7263679bf605a52e
+DIST when-1.1.37.tar.gz 51020 BLAKE2B 242d7833c91279bc7a73effc108a0f7d5edad9838006d8ff632c46215b7cd2a2187660075e2525a352a458a494abc648a9518945cdf18e2e7d58261e428efd8f SHA512 b1f0cb9cb797a5a32263ef2851498dfbf6a769d3e708b79ca1c5b37c7c877124194dd9b5ae78bfafebc0e73e82f306b3ae734a5ef7140fe3bf0e6b2cfcc4bb18
+EBUILD when-1.1.36.ebuild 897 BLAKE2B 7afb73f40599a10363e5a59872b337ec44c794ff9be4646cb480ffb4aff23cf745da783c10fa6608bd7a5ab0635367fb9c03671931fb47a1ee836a7ed73b32c2 SHA512 3e7ffda7ef158f9ef86933f97e041cc99014897ca1cb56dc6ef8d34e3b628ca2d8a5bcefb30790b03713993d8d5cc66bcf736118f6c8b428e9872de4eccb2a96
+EBUILD when-1.1.37.ebuild 900 BLAKE2B 70c62c2825ae71b966a08738f5eb1d03b9c300a488c67521c231503d637f8bc393040e4fe020d2d64cd90e2a78128f769095a563401c4a81ffcba6988c2d901c SHA512 1b70fb605f8e9df5670a0ca737672b1c61c64a73fa1189fe1c3f61442e6cdaba40ef5f0edd30f45bd3c724583a099c93878d409f8396dcec01bdf414ece65057
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/when/metadata.xml b/app-misc/when/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-misc/when/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/when/when-1.1.36.ebuild b/app-misc/when/when-1.1.36.ebuild
new file mode 100644
index 000000000000..3caacc09cdc3
--- /dev/null
+++ b/app-misc/when/when-1.1.36.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Minimalistic personal calendar program"
+HOMEPAGE="http://www.lightandmatter.com/when/when.html"
+SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/when_dist"
+
+DOCS=( README )
+
+src_prepare() {
+ default
+
+ # Fix path for tests
+ sed -i 's,^ when, ./when,' Makefile || die 'sed failed'
+}
+
+src_compile() { :; }
+
+src_test() {
+ # The when command requires these files, or attempts to run setup function.
+ mkdir "${HOME}"/.when || die 'mkdir failed'
+ touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
+ emake test
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/when/when-1.1.37.ebuild b/app-misc/when/when-1.1.37.ebuild
new file mode 100644
index 000000000000..533d342eb72f
--- /dev/null
+++ b/app-misc/when/when-1.1.37.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Minimalistic personal calendar program"
+HOMEPAGE="http://www.lightandmatter.com/when/when.html"
+SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/when_dist"
+
+DOCS=( README )
+
+src_prepare() {
+ default
+
+ # Fix path for tests
+ sed -i 's,^ when, ./when,' Makefile || die 'sed failed'
+}
+
+src_compile() { :; }
+
+src_test() {
+ # The when command requires these files, or attempts to run setup function.
+ mkdir "${HOME}"/.when || die 'mkdir failed'
+ touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
+ emake test
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-misc/wipe-2.3.1 b/app-misc/wipe-2.3.1
deleted file mode 100644
index 30fb4b49a520..000000000000
--- a/app-misc/wipe-2.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Secure file wiping utility based on Peter Gutman's patterns
-EAPI=6
-HOMEPAGE=http://wipe.sourceforge.net/
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/wipe/wipe-2.3.1.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=34c0801827d2f7a48aa15dc4eec83b9d
diff --git a/app-misc/wipe/Manifest b/app-misc/wipe/Manifest
new file mode 100644
index 000000000000..571e6a1993a5
--- /dev/null
+++ b/app-misc/wipe/Manifest
@@ -0,0 +1,4 @@
+AUX wipe-2.3.1-LDFLAGS.patch 470 BLAKE2B 76b63c80c561bea0fa5bea750b7eae9c6b07b516c6b4ae7b0949fa3e60b2b9c665afb28d48abf5b1c6f6a97062faec16a8f8145a24a461e71cbecb1d67a75b1b SHA512 e44d409f8177466c22c5a76fcb242e424d4584e587c6a8e25c5d3d8adb976b11a5cce2e0a77b99833a06879a4df3bdb2c71e468f08b7c7b2888b5ed1907dbd79
+DIST wipe-2.3.1.tar.bz2 72297 BLAKE2B e4c15e3b2f64d21d05b915af2c841518f686bec297a6b97eb91b57c1af2e5fb70193f54718ca2f9fa9d04ba684ca21f116b75328695e29f757fe44c62c8504e8 SHA512 63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110
+EBUILD wipe-2.3.1.ebuild 792 BLAKE2B 6f93fee4cc851e862cb3a35a39d27ae66e7cd78221095ce620f2babd641b8d6c6dfd88a493f80cd0aeb316acc00f5b6c8e0306b5471ac1c61deb5e3837e3bb8d SHA512 33d3351e8e5f15481f7c82ca86107d5f97ec6e95ae126cf3f073993223a64b737ed128066446ca5feba1a2ca6834435e7e1de072288e8ff8e6a88f4c80cbdd46
+MISC metadata.xml 317 BLAKE2B 3b1e4414ce9e5ed8fc5e6b88c064937c1b484a1bd39117a3d1709bcae5ab185d66c4879c7e7f18027aa9f5788fe55df1aaabaaf9d2843b7ad15b8ae487e83501 SHA512 d4c733a3d33e0b3528b2fa38555f9318897900ec1a9e4ae35efdf0ffb0ab1af68059786dd9ab99d1d943310829887e8c01954c3c597a752e086a94d513b85e3b
diff --git a/app-misc/wipe/files/wipe-2.3.1-LDFLAGS.patch b/app-misc/wipe/files/wipe-2.3.1-LDFLAGS.patch
new file mode 100644
index 000000000000..23a5d19d1cd7
--- /dev/null
+++ b/app-misc/wipe/files/wipe-2.3.1-LDFLAGS.patch
@@ -0,0 +1,19 @@
+--- wipe-2.3.1/Makefile.in
++++ wipe-2.3.1/Makefile.in
+@@ -5,6 +5,7 @@
+
+ CC=@CC@
+ CFLAGS=@CFLAGS@ -I@srcdir@ -D@OSTYPE@ $(DEFINES)
++LDFLAGS=@LDFLAGS@
+ DEBUG=@DEBUG@ -I@srcdir@ -D@OSTYPE@ $(DEFINES)
+
+ LIBS=@LIBS@
+@@ -31,7 +32,7 @@
+ all: $(REQ) $(BIN)
+
+ $(BIN): main.o wipe.o rand.o dir.o file.o blkdev.o lock.o text.o str.o percent.o prompt.o io.o mt.o
+- $(CC) $(LIBS) *.o -o $@
++ $(CC) $(LIBS) *.o -o $@ $(LDFLAGS)
+
+
+ # restores everything to a pre-configured state
diff --git a/app-misc/wipe/metadata.xml b/app-misc/wipe/metadata.xml
new file mode 100644
index 000000000000..8e517081e108
--- /dev/null
+++ b/app-misc/wipe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">wipe</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/wipe/wipe-2.3.1.ebuild b/app-misc/wipe/wipe-2.3.1.ebuild
new file mode 100644
index 000000000000..8775ae458c90
--- /dev/null
+++ b/app-misc/wipe/wipe-2.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Secure file wiping utility based on Peter Gutman's patterns"
+HOMEPAGE="http://wipe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin wipe
+ doman wipe.1
+ einstalldocs
+ dodoc TESTING
+}
+
+pkg_postinst() {
+ elog "Note that wipe is useless on journaling filesystems,"
+ elog "such as reiserfs, XFS, or ext3."
+ elog "See documentation for more info."
+}
diff --git a/app-misc/worker-2.19.6 b/app-misc/worker-2.19.6
deleted file mode 100644
index 1042cc1ab8a1..000000000000
--- a/app-misc/worker-2.19.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libSM x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Worker Filemanager: Amiga Directory Opus 4 clone
-EAPI=5
-HOMEPAGE=http://www.boomerangsworld.de/cms/worker/
-IUSE=avfs debug dbus examples libnotify +magic xinerama xft
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libSM x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-2.19.6.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ef8b5eb78b3dedc35a2c293781615c8
diff --git a/app-misc/worker-3.8.3 b/app-misc/worker-3.8.3
deleted file mode 100644
index c6339d59849f..000000000000
--- a/app-misc/worker-3.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( dev-lang/lua:0 ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Worker Filemanager: Amiga Directory Opus 4 clone
-EAPI=6
-HOMEPAGE=http://www.boomerangsworld.de/cms/worker/
-IUSE=avfs debug dbus examples libnotify lua +magic xinerama xft
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( dev-lang/lua:0 ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-3.8.3.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ae2e03e7b6b2e929f0d355acd5a0982
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
new file mode 100644
index 000000000000..9053b28501b0
--- /dev/null
+++ b/app-misc/worker/Manifest
@@ -0,0 +1,5 @@
+DIST worker-2.19.6.tar.bz2 1191546 BLAKE2B ab806ef55e39f6e0909a25b01abd9c79afe61681ec8b8437fdedd8e663102de298c62141a39a8f0411e40c3ef92635e1593882fd7b93ec6df133d1bccd358f05 SHA512 401c986ff532c225cbd183afd8424e900ed8ff874368d68cb985136d130b5a4d4746a59e391ba01ae610eacd4fec0d76061ba967112b8262e4a9297599596b60
+DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
+EBUILD worker-2.19.6.ebuild 1330 BLAKE2B e88996e3a9b9c57ceed6ab4abab1d8e407bbcb16719bf03f3ffcb64465b9f4814b01c6c5b1b817dcaf30382dbeeb3a20db456ba2a7a477d6af81b18606016278 SHA512 4180da05eebb296b791d326ad7bdb25d693e7eadda33e077f740dccf0a0d88fc71912b2f619a76d729e016a663259b042ce1a8a6e570b30cd6a63253b651858f
+EBUILD worker-3.8.3.ebuild 1270 BLAKE2B e7ff347eb2cfa70eb6df4bc6aff3a316c98ebd018ce01f345af02aa32fe1e46ebb5d2544d29c6bca669585246c8a96b077d1d4d08dea2c52b61fd5e81b3726ad SHA512 3e40f9c9c3e81e489381ef2c17d266170a61ebe0506b8ce5360bd1474c5a950916a0b6be0daa0321ff8a24664905826b95f551d3cddf2be887fb7854e131c38c
+MISC metadata.xml 636 BLAKE2B 9de5b71c8c1536a59308e33590c08227ef0bf31d96c6581fa87126576026bbd2646d1da648da45cfc35bace216a7a3a74c839340eb9f8b8a579b747feaead0b4 SHA512 67911dd438f9fa6ccd9e1f1bf47feb23016564b7d3cd33f846c17e82d83f70c39e6472bb61585a143475f207c3160c575e33fcd5edc5d2fe517ac5cf9f56c682
diff --git a/app-misc/worker/metadata.xml b/app-misc/worker/metadata.xml
new file mode 100644
index 000000000000..dd300924df2a
--- /dev/null
+++ b/app-misc/worker/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+ Worker is a filemanager for X-Window on UNIX.
+ It's a clone of the filemanager "Directory Opus 4", a very famous program
+ for Amiga-systems. The dirs and files are shown in two independent panels
+ (similar to MidnightCommander).
+</longdescription>
+<use>
+ <flag name="avfs">Enable support for <pkg>sys-fs/avfs</pkg></flag>
+ <flag name="magic">Add magic file support from <pkg>sys-apps/file</pkg> to automatically detect file types</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/worker/worker-2.19.6.ebuild b/app-misc/worker/worker-2.19.6.ebuild
new file mode 100644
index 000000000000..349dd3d81505
--- /dev/null
+++ b/app-misc/worker/worker-2.19.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
+HOMEPAGE="http://www.boomerangsworld.de/cms/worker/"
+SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+IUSE="avfs debug dbus examples libnotify +magic xinerama xft"
+
+RDEPEND="x11-libs/libSM
+ x11-libs/libX11
+ avfs? ( >=sys-fs/avfs-0.9.5 )
+ dbus? ( dev-libs/dbus-glib )
+ magic? ( sys-apps/file )
+ xft? ( x11-libs/libXft )
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
+
+src_prepare() {
+ # respect AR, bug #466014
+ sed -i -e "/AR/s/ar/$(tc-getAR)/" src/aguix/Makefile.in || die 'sed on Makefile.in failed'
+
+ epatch_user
+}
+
+src_configure() {
+ # there is no option for disabling libXinerama support
+ use xinerama || export ac_cv_lib_Xinerama_XineramaQueryScreens=no
+ econf \
+ --without-hal \
+ $(use_with avfs) \
+ $(use_with dbus) \
+ $(use_enable debug) \
+ $(use_enable libnotify inotify) \
+ $(use_with magic libmagic) \
+ $(use_enable xft)
+}
+
+src_install() {
+ default
+ if use examples; then
+ docinto examples
+ dodoc examples/config-*
+ fi
+}
diff --git a/app-misc/worker/worker-3.8.3.ebuild b/app-misc/worker/worker-3.8.3.ebuild
new file mode 100644
index 000000000000..f6b863b19af4
--- /dev/null
+++ b/app-misc/worker/worker-3.8.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
+HOMEPAGE="http://www.boomerangsworld.de/cms/worker/"
+SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
+
+RDEPEND="x11-libs/libX11
+ avfs? ( >=sys-fs/avfs-0.9.5 )
+ dbus? ( dev-libs/dbus-glib )
+ lua? ( dev-lang/lua:0 )
+ magic? ( sys-apps/file )
+ xft? ( x11-libs/libXft )
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
+
+src_configure() {
+ # there is no ./configure flag to disable libXinerama support
+ export ac_cv_lib_Xinerama_XineramaQueryScreens=$(usex xinerama)
+ econf \
+ --without-hal \
+ --enable-utf8 \
+ $(use_with avfs) \
+ $(use_with dbus) \
+ $(use_enable debug) \
+ $(use_enable libnotify inotify) \
+ $(use_enable lua) \
+ $(use_with magic libmagic) \
+ $(use_enable xft)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ default
+
+ if use examples; then
+ docinto examples
+ dodoc examples/config-*
+ fi
+}
diff --git a/app-misc/workrave-1.10.20 b/app-misc/workrave-1.10.20
deleted file mode 100644
index 31fdeec16199..000000000000
--- a/app-misc/workrave-1.10.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.18.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah >=dev-util/intltool-0.40.0 sys-devel/autoconf-archive x11-base/xorg-proto virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Helpful utility to attack Repetitive Strain Injury (RSI)
-EAPI=6
-HOMEPAGE=http://www.workrave.org/
-IUSE=ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.18.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=ayatana? ( introspection ) python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz -> workrave-1.10.20.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce737b2f519a856b0b0758e2492ce39b
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
new file mode 100644
index 000000000000..d7f2c4c19bbe
--- /dev/null
+++ b/app-misc/workrave/Manifest
@@ -0,0 +1,4 @@
+AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
+DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
+EBUILD workrave-1.10.20.ebuild 2747 BLAKE2B cc96842b44fc276753dc4eef8ba6fc1d9cdf1e56e3c0173711eeead52b9883d6e92d4b17e8f273a9744242a0da36c47c710eca75f2dadfcfd70345118fdeb78c SHA512 d09af88807d0b98abcbba41d9943595ca947a217c3d17e106550c94e451e754c8b009dc0014a94134a607185e250879a7548fddd60aaf092ce0bd2ec98ce7202
+MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
new file mode 100644
index 000000000000..76c2e67ed607
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac.old 2015-10-24 10:11:47.469290574 +0200
++++ b/configure.ac 2015-10-24 10:14:35.918680898 +0200
+@@ -884,20 +884,12 @@
+ if test "x$enable_gstreamer" != "xno";
+ then
+ PKG_CHECK_MODULES([GSTREAMER],
+- [gstreamer-0.10],
+- [config_gstreamer=yes
+- AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
+-
+- if test "x$config_gstreamer" != "xyes";
+- then
+- PKG_CHECK_MODULES([GSTREAMER],
+ [gstreamer-1.0],
+ [config_gstreamer=yes
+ AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])],
+ [if test "x$enable_gstreamer" = "xyes"; then
+ AC_MSG_ERROR([GStreamer development headers not found.])
+ fi])
+- fi
+ fi
+
+
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
new file mode 100644
index 000000000000..a6781d3a5e7c
--- /dev/null
+++ b/app-misc/workrave/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="mate">Add support for MATE panel</flag>
+ <flag name="xfce">Add support for XFCE panel</flag>
+ </use>
+ <longdescription>
+ Workrave is a program that assists in the recovery and prevention
+ of Repetitive Strain Injury (RSI). The program frequently alerts
+ you to take micro-pauses, rest breaks and restricts you to your
+ daily limit.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">rcaelers/workrave</remote-id>
+ <remote-id type="sourceforge">workrave</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
new file mode 100644
index 000000000000..84cbc53fece7
--- /dev/null
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-single-r1 versionator vcs-snapshot
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+MY_PV=$(replace_all_version_separators '_')
+SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+# dbus support looks to be used only for trying to use panel applets on gnome3!
+IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
+REQUIRED_USE="ayatana? ( introspection ) ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ >=dev-libs/glib-2.28.0:2
+ >=x11-libs/gtk+-3.0:3[introspection?,X]
+ >=dev-cpp/gtkmm-3.18.0:3.0
+ >=dev-cpp/glibmm-2.28.0:2
+ >=dev-libs/libsigc++-2.2.4.2:2
+ ayatana? (
+ >=dev-libs/libdbusmenu-0.4[gtk3,introspection]
+ >=dev-libs/libindicator-0.4:3 )
+ gnome? ( >=gnome-base/gnome-shell-3.6.2 )
+ gstreamer? (
+ media-libs/gstreamer:1.0[introspection?]
+ media-libs/gst-plugins-base:1.0[introspection?]
+ media-plugins/gst-plugins-meta:1.0 )
+ introspection? ( dev-libs/gobject-introspection:= )
+ mate? ( mate-base/mate-applets )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+ xfce? (
+ >=x11-libs/gtk+-2.6.0:2[introspection?]
+ >=xfce-base/xfce4-panel-4.4 )
+ x11-libs/libXScrnSaver
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libXmu
+ ${PYTHON_DEPS}
+"
+# dbus? (
+# >=sys-apps/dbus-1.2
+# dev-libs/dbus-glib )
+
+DEPEND="${RDEPEND}
+ dev-python/cheetah
+ >=dev-util/intltool-0.40.0
+ sys-devel/autoconf-archive
+ x11-base/xorg-proto
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-sgml-utils
+ app-text/xmlto )
+ nls? ( >=sys-devel/gettext-0.17 )
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+ # Fix gstreamer slot automagic dependency, bug #563584
+ # http://issues.workrave.org/show_bug.cgi?id=1179
+ eapply "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # gnet ("distribution") is dead for ages and other distributions stopped
+ # relying on it for such time too.
+ gnome2_src_configure \
+ --disable-dbus \
+ --disable-distribution \
+ --enable-exercises \
+ --disable-experimental \
+ --disable-gnome2 \
+ --disable-static \
+ --disable-xml \
+ $(use_enable ayatana indicator) \
+ $(use_enable doc manual) \
+ $(use_enable gnome gnome3) \
+ $(use_enable gstreamer) \
+ $(use_enable introspection) \
+ $(use_enable mate) \
+ $(use_enable nls) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable test tests) \
+ $(use_enable xfce)
+}
diff --git a/app-misc/wyrd-1.4.6-r1 b/app-misc/wyrd-1.4.6-r1
deleted file mode 100644
index cd6fa3d7f316..000000000000
--- a/app-misc/wyrd-1.4.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:0=[unicode?] >=app-misc/remind-03.01 dev-ml/camlp4:= >=dev-lang/ocaml-3.08
-DESCRIPTION=Text-based front-end to Remind
-EAPI=5
-HOMEPAGE=http://pessimization.com/software/wyrd/
-IUSE=unicode
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] >=app-misc/remind-03.01 dev-ml/camlp4:=
-SLOT=0
-SRC_URI=http://pessimization.com/software/wyrd/wyrd-1.4.6.tar.gz
-_md5_=3e9c770deb2b6347f68ec8eb2ad8d3c9
diff --git a/app-misc/wyrd/Manifest b/app-misc/wyrd/Manifest
new file mode 100644
index 000000000000..59dd61b4385a
--- /dev/null
+++ b/app-misc/wyrd/Manifest
@@ -0,0 +1,3 @@
+DIST wyrd-1.4.6.tar.gz 425829 BLAKE2B f732b0d69ebb200913f51ab5ea1d42f551469ebd4bc4fd22862499a01db6a6a5bfc21caac7b14e7bf247b75b73a64c3d7ed7c9249d0bc4123a6fc1a27d5017db SHA512 fc09c4567ea8d6225638ee6851ddab716665913b7d7b2f6b5a3cc7f2af9144df617e2a95ca78c74874bec3ff355aba028c7c51eafe1426d9ae803ab77ce84477
+EBUILD wyrd-1.4.6-r1.ebuild 653 BLAKE2B 292c6f86f35e078526610e5303aeef5defd6073b9c404aa0936cb9a16b0686468d1a5eef3fe9d0e4d64e3cfd87980bab49d02b8f0ff91144db4628162adee336 SHA512 791ebbaec3b630cad1a5392319948a39df0a5ad6289e7caea04d8884854d9e02890f9a226c116cc8616a3bc16d0c4ada6a14fcfdb799a11d2ca91cb2fa90c165
+MISC metadata.xml 685 BLAKE2B 53ba89c84de3ae5d0a70c8c2f6aef9000aea4d201f4998557a2fec17d525400f143c279782fd63189f794737163c1172ac4392fde5c5c0f1cdfd29a0b24ddc87 SHA512 96684d600777e987e9cc7b5ff08713d1292e2413778cfb2775127043e4685acd2df50294b72186eedacbeb448601a3064e98a4851198df6875491cc20d01681a
diff --git a/app-misc/wyrd/metadata.xml b/app-misc/wyrd/metadata.xml
new file mode 100644
index 000000000000..4920b59165e4
--- /dev/null
+++ b/app-misc/wyrd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Wyrd is a text-based front-end to Remind, a sophisticated calendar and alarm
+ program. Remind's power lies in its programmability, and Wyrd does not hide this
+ capability behind flashy GUI dialogs. Rather, Wyrd is designed to make you more
+ efficient at editing your reminder files directly. It also offers a scrollable
+ timetable suitable for visualizing your schedule at a glance.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-misc/wyrd/wyrd-1.4.6-r1.ebuild b/app-misc/wyrd/wyrd-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..531160d57311
--- /dev/null
+++ b/app-misc/wyrd/wyrd-1.4.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Text-based front-end to Remind"
+HOMEPAGE="http://pessimization.com/software/wyrd/"
+SRC_URI="http://pessimization.com/software/wyrd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="unicode"
+
+RDEPEND="
+ sys-libs/ncurses:0=[unicode?]
+ >=app-misc/remind-03.01
+ dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}
+ >=dev-lang/ocaml-3.08
+"
+
+src_configure() {
+ econf \
+ $(use_enable unicode utf8)
+}
+
+src_install() {
+ export STRIP_MASK="/usr/bin/wyrd"
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog
+ dohtml doc/manual.html
+}
diff --git a/app-misc/xmind-3.5.3.201506180105-r2 b/app-misc/xmind-3.5.3.201506180105-r2
deleted file mode 100644
index 52c8943e327a..000000000000
--- a/app-misc/xmind-3.5.3.201506180105-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=5
-HOMEPAGE=https://www.xmind.net
-KEYWORDS=amd64 x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.3.201506180105.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b61b2695899d930261580226def15a24
diff --git a/app-misc/xmind-3.7.6_p201801311814 b/app-misc/xmind-3.7.6_p201801311814
deleted file mode 100644
index 4d740112bc30..000000000000
--- a/app-misc/xmind-3.7.6_p201801311814
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=sys-apps/sed-4
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=6
-HOMEPAGE=https://www.xmind.net
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e64b2bf1d92151d2ecba9a0a3844d7f8
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
new file mode 100644
index 000000000000..372b3fd32056
--- /dev/null
+++ b/app-misc/xmind/Manifest
@@ -0,0 +1,10 @@
+AUX xmind-3.4.0-config.ini 1671 BLAKE2B 1db0351ca78f06ebd2966d32c402334ceca45cc99d087d7670895bad8b6e68b2dd9fc880b41fc877db19e8b1d864364f1219c17bc03bd3b1d36e3cc78f9c1bb0 SHA512 dc6e054839eeadd6aab4abd41f42766567404b44b5d7fbaaad785a45f1b9c1d92e4eeaafb936bfff8d827c6ebfbccf4b02f3f417c2a8280300f377608913f763
+AUX xmind-wrapper 488 BLAKE2B 5880ece73df047121bbda1eb8f6b891685bba3e704ac9d47f79970a81be8f8e20c35febd278278a2825692c12ea34a4d24627ef8b9ba91f1c6ea8f602fe8eddf SHA512 f400d3f527897f087d5e20bce43299a20bd64a458f7c95a47447c78bf0c2b951a8f38d29e4a6ce028a9b421c41880fb5850184cb0b190de79f712ec807dbf9d7
+AUX xmind-wrapper-3.5.3 493 BLAKE2B 82aa49de2c90e2f943550d328253749310032e95e1dbd33e092383240950698ccf61bd85e1b9315275ebacc89cef78c518152e6e70f9f3246af8d41f850d7aad SHA512 555e1103dc5714bb5924421899262f1112c83807233c9969afdaa0eb0cba631b13e4fa984af7c2029fe57fb7e135f51a1d00e3dd3fffb8bcf3bb96eb93dfad80
+AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a013046aa8dd8c0c5463490918182a52d8fbf476332265685a9a80785dfa431dd912ff22145a13a00b99f SHA512 452560c9b1ab68df745616ac032089fb05f1aab61c7e1b247eb241195dd38e11b69459abb5e2b6696db76e2e421291de4dc41030f525f77f0e30522b52540248
+DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cdf98aacd793de66cca91e6b1f8429eaa0dfb276cc5a11a0eb00f055cb1b66e69bc084fd29abcfa6cecd2811de4f7d7b57f SHA512 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
+DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
+DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
+EBUILD xmind-3.5.3.201506180105-r2.ebuild 2224 BLAKE2B 6e866ec7b2f12ec302d9bb7442565d476f1a8555781b475d4c59641d2755b371879c923ad9fbb89cdfe6d864aaa91649df1c25ec49bcb39b2e4cadd9f001dd2d SHA512 10201e1e9043da37fc6d14fd5f5f2e370aca617558a9d2fb78d423d7c792fa5ea783fc6d1f0c1eb7c16479bf731d644382ae31b6cec1240a02c8dd64c7e78981
+EBUILD xmind-3.7.6_p201801311814.ebuild 2179 BLAKE2B 9d3acb425169c03da22b6fad93a5ccc292e4a416c92dd58e41169c08ae56376438b0475c528a0288bd8641e067e578c8c3df845d326bfd3cb2ee13b73b4bdc5b SHA512 9757e194263ad2fc5a29cc2f9f12d8f47352f2773021c1e2c5f2b536e6769ca80656f35627ac3bde264c13b48911d196cb0e7cbf92faa220f6328edaa1b3921e
+MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/files/xmind-3.4.0-config.ini b/app-misc/xmind/files/xmind-3.4.0-config.ini
new file mode 100644
index 000000000000..62abbd1f31ff
--- /dev/null
+++ b/app-misc/xmind/files/xmind-3.4.0-config.ini
@@ -0,0 +1,20 @@
+#These configurations are shared among all installs. Branded For XMind 2013.
+#Tue, 05 Nov 2013 22:06:37 +0800
+
+eclipse.buildId=3.4.0.201311050558
+org.xmind.product.distribution.id=cathy_portable
+org.xmind.product.license.restrictions=
+org.xmind.debug.core.workbookSave=true
+#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
+#Tue Nov 05 22:05:55 HKT 2013
+eclipse.p2.profile=profile
+osgi.framework=file\:plugins/org.eclipse.osgi_3.8.2.v20130124-134944.jar
+osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.301.v20120914-163612.jar@1\:start
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
+eclipse.product=org.xmind.cathy.product
+osgi.splashPath=platform\:/base/plugins/org.xmind.cathy
+osgi.framework.extensions=reference\:file\:org.eclipse.osgi.nl_da_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_de_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_es_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_fr_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_ja_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_ko_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_ru_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_sl_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_zh_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_zh_TW_4.2.0.v20121120043402.jar
+osgi.bundles.defaultStartLevel=4
+eclipse.p2.data.area=@config.dir/../p2
+eclipse.application=org.xmind.cathy.application
+osgi.requiredJavaVersion=1.5
diff --git a/app-misc/xmind/files/xmind-wrapper b/app-misc/xmind/files/xmind-wrapper
new file mode 100644
index 000000000000..728edce3e24a
--- /dev/null
+++ b/app-misc/xmind/files/xmind-wrapper
@@ -0,0 +1,8 @@
+#!/bin/bash
+#XMind wrapper script, copies configuration stuff into the user's local config dir if either
+#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
+if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
+ mkdir -p ~/.xmind/configuration-cathy
+ cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
+fi
+/opt/xmind/XMind/XMind
diff --git a/app-misc/xmind/files/xmind-wrapper-3.5.3 b/app-misc/xmind/files/xmind-wrapper-3.5.3
new file mode 100644
index 000000000000..b38ef1476246
--- /dev/null
+++ b/app-misc/xmind/files/xmind-wrapper-3.5.3
@@ -0,0 +1,8 @@
+#!/bin/bash
+#XMind wrapper script, copies configuration stuff into the user's local config dir if either
+#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
+if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
+ mkdir -p ~/.xmind/configuration-cathy
+ cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
+fi
+/opt/xmind/XMind/XMind "$@"
diff --git a/app-misc/xmind/files/xmind-wrapper-3.7.0 b/app-misc/xmind/files/xmind-wrapper-3.7.0
new file mode 100644
index 000000000000..41636ffd4c2b
--- /dev/null
+++ b/app-misc/xmind/files/xmind-wrapper-3.7.0
@@ -0,0 +1,8 @@
+#!/bin/bash
+#XMind wrapper script, copies configuration stuff into the user's local config dir if either
+#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
+if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
+ mkdir -p ~/.xmind/configuration-cathy
+ cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
+fi
+SWT_GTK3=0 /opt/xmind/XMind/XMind "$@"
diff --git a/app-misc/xmind/metadata.xml b/app-misc/xmind/metadata.xml
new file mode 100644
index 000000000000..8c8ef6e93c28
--- /dev/null
+++ b/app-misc/xmind/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>creffett@gentoo.org</email>
+ <name>Chris Reffett</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
new file mode 100644
index 000000000000..a5d4a0ca6de4
--- /dev/null
+++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit desktop eutils multilib gnome2-utils
+
+MY_PN="${PN}-portable"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A brainstorming and mind mapping software tool"
+HOMEPAGE="https://www.xmind.net"
+SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
+ https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
+LICENSE="EPL-1.0 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.5
+ x11-libs/gtk+:2
+"
+
+S=${WORKDIR}
+
+QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
+QA_FLAGS_IGNORED="
+ opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
+ opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
+ opt/xmind/XMind/libcairo-swt.so
+ opt/xmind/XMind/XMind
+"
+
+src_configure() {
+ if use amd64; then
+ XDIR="XMind_Linux_64bit"
+ else
+ XDIR="XMind_Linux"
+ fi
+ mv "$XDIR" XMind || die
+ mv XMind/.eclipseproduct Commons || die
+ cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
+ # force data instance & config area to be at home/.xmind directory
+ sed \
+ -e '/-configuration/d' \
+ -e '/\.\/configuration/d' \
+ -e '/-data/d' \
+ -e '/\.\.\/Commons\/data\/workspace-cathy/d' \
+ -e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
+ -i XMind/XMind.ini || die
+ echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
+ echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ insinto /opt/xmind
+ doins -r Commons XMind
+ fperms a+rx "/opt/xmind/XMind/XMind"
+
+ exeinto /opt/bin
+ newexe "${FILESDIR}/xmind-wrapper-3.5.3" xmind
+
+ # install icons
+ local res
+ for res in 16 32 48; do
+ newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
+ done
+
+ make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ elog "For audio notes support, install media-sound/lame"
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
new file mode 100644
index 000000000000..12a6a7c49210
--- /dev/null
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop font gnome2-utils
+
+MY_PV="8-update7"
+MY_P="${PN}-${MY_PV}-linux"
+
+DESCRIPTION="A brainstorming and mind mapping software tool"
+HOMEPAGE="https://www.xmind.net"
+SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
+ https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
+LICENSE="EPL-1.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.8
+ x11-libs/gtk+:2
+"
+
+S=${WORKDIR}
+
+QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
+QA_FLAGS_IGNORED="
+ opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
+ opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444/eclipse_1617.so
+ opt/xmind/XMind/XMind
+"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}/fonts"
+
+src_configure() {
+ if use amd64; then
+ XDIR="XMind_amd64"
+ else
+ XDIR="XMind_i388"
+ fi
+ mv "$XDIR" XMind || die
+ # force data instance & config area to be at home/.xmind directory
+ sed \
+ -e '/-configuration/d' \
+ -e '/\.\/configuration/d' \
+ -e '/-data/d' \
+ -e '/\.\.\/Commons\/data\/workspace-cathy/d' \
+ -e 's/\.\.\/plugins/\/opt\/xmind\/plugins/g' \
+ -e '/-vmargs/i-showsplash' \
+ -e '/vmargs/iorg.xmind.cathy' \
+ -i XMind/XMind.ini || die
+ echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
+ echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ insinto /opt/xmind
+ doins -r plugins configuration features XMind
+ fperms a+rx "/opt/xmind/XMind/XMind"
+
+ exeinto /opt/bin
+ newexe "${FILESDIR}/xmind-wrapper-3.7.0" xmind
+
+ # install icons
+ local res
+ for res in 16 32 48; do
+ newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
+ done
+
+ make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
+ font_src_install
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ font_pkg_postinst
+ elog "For audio notes support, install media-sound/lame"
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/yagtd-0.3.4-r1 b/app-misc/yagtd-0.3.4-r1
deleted file mode 100644
index cc1340f2e328..000000000000
--- a/app-misc/yagtd-0.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=CLI todo list manager based on the 'Getting Things Done' philosophy
-EAPI=5
-HOMEPAGE=https://gna.org/projects/yagtd/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/yagtd/yagtd-0.3.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8bd2f7ed1219c9d8360a5a909e31de7b
diff --git a/app-misc/yagtd/Manifest b/app-misc/yagtd/Manifest
new file mode 100644
index 000000000000..bfc5c1734f54
--- /dev/null
+++ b/app-misc/yagtd/Manifest
@@ -0,0 +1,3 @@
+DIST yagtd-0.3.4.tar.gz 1402287 BLAKE2B 52712e11fb30c6951ea1c6dd7ca826a8e38d68c95c6716cbc93524959d98c97f75413166312cfb6c684d27d6423493c215e9bec22f3a7112e064b1a413c9c16b SHA512 99f8dd5344615285a09e039f9c829fdcb09305baa1beaef03710fb5661ba5dde53491264142e9ed2c207e89e06855cbd64621e447468aa033e9f972b896385a8
+EBUILD yagtd-0.3.4-r1.ebuild 716 BLAKE2B 0d9b7b166e718a9d69b830305704258749795cb244d238d3110b1656a120cbd19b71a65e08b70e542931974244588868e858aae4f34d86eda39f4a92eef0694b SHA512 e08af3a6e46cac85fade6e7cd5d76edb51b291ee4ba89de30aeafd0a046db269f5f759f0d05d245fee0977f7c4031bd30dec59c10d001ddbe8179e5297946cf2
+MISC metadata.xml 598 BLAKE2B 291f0e2b7556cee527dc1fa85b29315efd060eb1e831f5f3c90ee7055158c1197254296d08b64c8ea10cd8c29437111534e3bebb36c78c9b3547700bd85dc74e SHA512 6b8a68577ea7e42575d795b3aecb3726b325e0cc6bc8828eb497c92175a537d551baf3f1872eb205d08d2312b3cc6fba43ba6df62519f157ffd3a29b33cc2864
diff --git a/app-misc/yagtd/metadata.xml b/app-misc/yagtd/metadata.xml
new file mode 100644
index 000000000000..a28d1359ca9c
--- /dev/null
+++ b/app-misc/yagtd/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription lang="en">
+yaGTD incorporates major features from Allen's 'Getting Things Done' philosophy and
+notion of urgency and importance preached by Stephen Covey
+(cf Seven Habits of Highly Effective People book).
+To resume, if you are comfortable at the command line a simple plain text is an
+age-old but perfect method for tracking your stuff, and yaGTD can help you to
+manage efficiently this file.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/yagtd/yagtd-0.3.4-r1.ebuild b/app-misc/yagtd/yagtd-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..d1f94ec737ae
--- /dev/null
+++ b/app-misc/yagtd/yagtd-0.3.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="CLI todo list manager based on the 'Getting Things Done' philosophy"
+HOMEPAGE="https://gna.org/projects/yagtd/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+ #fix doc install location
+ sed -i -e "s:\/doc\/yagtd:\/doc\/${P}:g" setup.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_install() {
+ distutils-r1_python_install
+ ln -s yagtd.py "${D}$(python_get_scriptdir)"/yagtd || die
+}
+
+src_install() {
+ distutils-r1_src_install
+ dosym yagtd.py /usr/bin/yagtd
+}
diff --git a/app-misc/yq-2.1.2 b/app-misc/yq-2.1.2
deleted file mode 100644
index 1ae86a70e27c..000000000000
--- a/app-misc/yq-2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
-EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yq/yq-2.1.2.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d7aa65ab62825fbe21be5d48d2ccac4
diff --git a/app-misc/yq-2.3.0 b/app-misc/yq-2.3.0
deleted file mode 100644
index 6be230e70c28..000000000000
--- a/app-misc/yq-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
-EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yq/yq-2.3.0.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51fd84d0aed7bbaccff3702fd698721e
diff --git a/app-misc/yq-2.3.3 b/app-misc/yq-2.3.3
deleted file mode 100644
index 34d2fef1a7a1..000000000000
--- a/app-misc/yq-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
-EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yq/yq-2.3.3.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51fd84d0aed7bbaccff3702fd698721e
diff --git a/app-misc/yq-2.3.4 b/app-misc/yq-2.3.4
deleted file mode 100644
index 0f2bd776dd14..000000000000
--- a/app-misc/yq-2.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
-EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yq/yq-2.3.4.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d7aa65ab62825fbe21be5d48d2ccac4
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
new file mode 100644
index 000000000000..1a7ebcb6a38b
--- /dev/null
+++ b/app-misc/yq/Manifest
@@ -0,0 +1,9 @@
+DIST yq-2.1.2.tar.gz 4704 BLAKE2B 980f0025ed397d620cf4883b3603411e7d969d641a50b6ad7f8be2ed9cb326772b0d79b36b0fe1c1f168e9b859bab63be3c0a6e267fef9ae15e8aa66574dbd67 SHA512 88f32e58aacd82deb06deee6910f5a145e54d20829f438cd47248d560119dd8112e0813ea8d55708664ac29ef011bbc3fd6b882e1c538ef44aaa9aa119584e99
+DIST yq-2.3.0.tar.gz 5165 BLAKE2B 5d317d78e4e9e0fbe3064c004b33cb267fe0947d011ea3f12b873a2a31b16695c57bd932b2f2e5145afa22f9cccb43bed0a34847c4975f83bf63651e6b3b5372 SHA512 f256d1766b697f6bcb88bb8129e587bb99929154e13167f179bff1669b08b5444af90d7a17382b4f434092110ddb9e578c1f374b56aba03b4a4406fc25b76d6a
+DIST yq-2.3.3.tar.gz 5486 BLAKE2B fa02b7466d54dbb5ddd4090329e1dd1d3826aa12d647563296236122fa34a85e7ee3e7f06edc227264db8fc18a215f39a5b171c18e498132bf701ef25def7936 SHA512 58461c74f907be241047197967ec316ea6ffe2accd99c8b97a158369d06f32c758c56edaeea30d3e4988e295a58fabeb47d960097b136c6b0bf16c2792b7f75d
+DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
+EBUILD yq-2.1.2.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
+EBUILD yq-2.3.0.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
+EBUILD yq-2.3.3.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
+EBUILD yq-2.3.4.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
+MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/metadata.xml b/app-misc/yq/metadata.xml
new file mode 100644
index 000000000000..37885efab095
--- /dev/null
+++ b/app-misc/yq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="pypi">yq</remote-id>
+ <remote-id type="github">kislyuk/yq</remote-id>
+ </upstream>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
new file mode 100644
index 000000000000..1508219d3b3b
--- /dev/null
+++ b/app-misc/yq/yq-2.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/jq
+ >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ ./test/test.py || die
+}
diff --git a/app-misc/yq/yq-2.3.0.ebuild b/app-misc/yq/yq-2.3.0.ebuild
new file mode 100644
index 000000000000..ab7d35d6967b
--- /dev/null
+++ b/app-misc/yq/yq-2.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/jq
+ >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ ./test/test.py || die
+}
diff --git a/app-misc/yq/yq-2.3.3.ebuild b/app-misc/yq/yq-2.3.3.ebuild
new file mode 100644
index 000000000000..ab7d35d6967b
--- /dev/null
+++ b/app-misc/yq/yq-2.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/jq
+ >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ ./test/test.py || die
+}
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
new file mode 100644
index 000000000000..1508219d3b3b
--- /dev/null
+++ b/app-misc/yq/yq-2.3.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/jq
+ >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ ./test/test.py || die
+}
diff --git a/app-misc/ytree-1.99_p1 b/app-misc/ytree-1.99_p1
deleted file mode 100644
index 7967f3bbf08a..000000000000
--- a/app-misc/ytree-1.99_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=A curses-based file manager
-EAPI=6
-HOMEPAGE=http://www.han.de/~werner/ytree.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=http://www.han.de/~werner/ytree-1.99pl1.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=656ca482b759586ded0fa2a556e728c1
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
new file mode 100644
index 000000000000..a397e715fa58
--- /dev/null
+++ b/app-misc/ytree/Manifest
@@ -0,0 +1,4 @@
+AUX ytree-1.94-bindir.patch 433 BLAKE2B 3795483e588f1c308ab28a7a952a847d0bc16dbe12ebf96e49cf28018e51e6c4c31cab0b8e18af60ffbb814c747de2293b3c270dacb03d556bdfb6a2a1c3752f SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a
+DIST ytree-1.99pl1.tar.gz 122996 BLAKE2B 2e40cca19cf9c9c3726e877bd05158acb34f732d266c0a7d9d6a15c6c665eb4efa38694ceee81d1006e5eeb2fb5be92be8dc40c3b9aff52eed962491eec1f06a SHA512 3d2ffae5cccf973bb06ec64917dc8f5b69e0ab95910144c5058b166479334fc563807a813ef608678463a032a8d2234f1006b820baa04aa95e77b06888af81fc
+EBUILD ytree-1.99_p1.ebuild 642 BLAKE2B b4dffbcb98eae5f27b36d51772c091c3faa26bf56a85a0564556425d8fa55a48cf026e7f694665d4cba7bfc5ceee378a43617f5b81175e1dd9e323ec4d18d5da SHA512 19c27f5f852bfa4dcdaf25163160a9af3710907a4ade674faad5698f3ac6484b6f2110078b9383ac79b9687898a7910ff10f347d0ad89ec46c86031cb8f62e4d
+MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/files/ytree-1.94-bindir.patch b/app-misc/ytree/files/ytree-1.94-bindir.patch
new file mode 100644
index 000000000000..a79904e923b3
--- /dev/null
+++ b/app-misc/ytree/files/ytree-1.94-bindir.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.orig 2010-04-11 17:44:57.511131862 +0200
++++ ./Makefile 2010-04-11 17:44:14.143178887 +0200
+@@ -225,6 +225,8 @@
+ $(CC) $(LFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+
+ install: $(MAIN)
++ if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
++ if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi
+ install $(MAIN) $(BINDIR)
+ gzip -9c ytree.1 > ytree.1.gz
+ if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz $(MANDIR)/; fi
diff --git a/app-misc/ytree/metadata.xml b/app-misc/ytree/metadata.xml
new file mode 100644
index 000000000000..69570e849328
--- /dev/null
+++ b/app-misc/ytree/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>kensington@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-misc/ytree/ytree-1.99_p1.ebuild b/app-misc/ytree/ytree-1.99_p1.ebuild
new file mode 100644
index 000000000000..2d4f7c48fb4c
--- /dev/null
+++ b/app-misc/ytree/ytree-1.99_p1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-1.99pl1"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="http://www.han.de/~werner/ytree.html"
+SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.94-bindir.patch" )
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_install() {
+ emake DESTDIR="${D}usr" install
+ einstalldocs
+}
diff --git a/app-misc/yworklog-0.0.7 b/app-misc/yworklog-0.0.7
deleted file mode 100644
index b8fed6cea81a..000000000000
--- a/app-misc/yworklog-0.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sqlalchemy dev-python/cement[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/alembic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Stack based utility with CLI interface helping to monitor time spent on tasks
-EAPI=5
-HOMEPAGE=https://github.com/yaccz/worklog
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/sqlalchemy dev-python/cement[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/alembic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yworklog/yworklog-0.0.7.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c385af190a0e6288f97a89a8a8a6f014
diff --git a/app-misc/yworklog/Manifest b/app-misc/yworklog/Manifest
new file mode 100644
index 000000000000..41a793ff9221
--- /dev/null
+++ b/app-misc/yworklog/Manifest
@@ -0,0 +1,3 @@
+DIST yworklog-0.0.7.tar.gz 9689 BLAKE2B 81353a1909087e553d63cf334bb52b6c3aaece45b327964beffacd239c9d3b2104b399dc92a5859dfc6f4a36d7306783a642493c80c1514e997475bbefcf8a98 SHA512 66a9dd118dfaca04d70738a4edfbd905b19661753bc0a637032cba458b173839d23a1430b3667c90acec6597b98383a0dce8c229a1fac233c84870aff7707fca
+EBUILD yworklog-0.0.7.ebuild 628 BLAKE2B 6a48920e710e64feb6b0012a4e4f4ce53b392816db3b6cc3266286d31cdb0664ea487c9d317363ecc1721fd4b702096519f82cafdbab4ff5e7cd6d6926df20d6 SHA512 639b7eca0b29284c6961acb107ad7cd68aa11a2319f56fc9299aa4f2a1285c29599d2859ed49ab1cba600204b3a2b59cf98e477ff2cfa548bdfa2b0cd4038e58
+MISC metadata.xml 298 BLAKE2B a135303e57df4fd66e4845e3e08994e365db6a67da9e28346d012346ba8d4ff70cda18191fdbe9f809f7a6945f1d1673df5d82f33747cb089f8de792f2ae6d0f SHA512 bb355735f463b4cdda2e5e8d4a4ea5a2eb4e5377dfa25ec0c223be17ed018b0827e56e4573c8171c9517e64c427edfb97c9e58999012e2a8ce9780ab502c5a32
diff --git a/app-misc/yworklog/metadata.xml b/app-misc/yworklog/metadata.xml
new file mode 100644
index 000000000000..dde0e7905383
--- /dev/null
+++ b/app-misc/yworklog/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="pypi">yworklog</remote-id>
+ <remote-id type="github">yaccz/worklog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/yworklog/yworklog-0.0.7.ebuild b/app-misc/yworklog/yworklog-0.0.7.ebuild
new file mode 100644
index 000000000000..a0ec79504713
--- /dev/null
+++ b/app-misc/yworklog/yworklog-0.0.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=sqlite
+
+inherit distutils-r1
+
+DESCRIPTION="Stack based utility with CLI interface helping to monitor time spent on tasks"
+HOMEPAGE="https://github.com/yaccz/worklog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/sqlalchemy
+ dev-python/cement[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/alembic[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/app-misc/zisofs-tools-1.0.8 b/app-misc/zisofs-tools-1.0.8
deleted file mode 100644
index 9dd05ed840be..000000000000
--- a/app-misc/zisofs-tools-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.1.4
-DESCRIPTION=User utilities for zisofs
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/zisofs/
-IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/fs/zisofs/zisofs-tools-1.0.8.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b2e2fdc4ce62256e7920146825e2278
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
new file mode 100644
index 000000000000..df5d868f6d09
--- /dev/null
+++ b/app-misc/zisofs-tools/Manifest
@@ -0,0 +1,3 @@
+DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
+EBUILD zisofs-tools-1.0.8.ebuild 674 BLAKE2B 9c2a0eb84141c7af0020eef95ddc8f460a46ea6c20c38fd6ba59d2e01e4a0055e73f3955d9e1c2c820e0133d1fce0b5d8d9f149af03f52469795638441000274 SHA512 cf1278e1b472482eb65780bf41ecec9683cfaa83403e13c62c96963e17059e9cbc6157bac14d5386d9972dd2232f3dcc4e53afbd9a7e15f1a178fe66f84ffb6e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/metadata.xml b/app-misc/zisofs-tools/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-misc/zisofs-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
new file mode 100644
index 000000000000..506ed5950f9d
--- /dev/null
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="User utilities for zisofs"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/zisofs/"
+SRC_URI="mirror://kernel/linux/utils/fs/zisofs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+IUSE="static"
+
+RDEPEND=">=sys-libs/zlib-1.1.4"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ use static && append-ldflags -static
+ default
+}
+
+src_install() {
+ emake INSTALLROOT="${D}" install
+ dodoc CHANGES INSTALL README
+}
diff --git a/app-misc/zygrib-8.0.1-r1 b/app-misc/zygrib-8.0.1-r1
deleted file mode 100644
index 93ce58239d4e..000000000000
--- a/app-misc/zygrib-8.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/bzip2 dev-qt/qtsvg:5 media-libs/libpng:* sci-libs/libnova sci-libs/proj sys-libs/zlib x11-libs/qwt:6[qt5(+)]
-DESCRIPTION=GRIB File Viewer - Weather data visualization
-EAPI=6
-HOMEPAGE=http://www.zygrib.org/
-IUSE=+maps
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 public-domain
-RDEPEND=app-arch/bzip2 dev-qt/qtsvg:5 media-libs/libpng:* sci-libs/libnova sci-libs/proj sys-libs/zlib x11-libs/qwt:6[qt5(+)]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/zyGrib-8.0.1.tgz -> zygrib-8.0.1.tgz https://dev.gentoo.org/~mschiff/distfiles/zygrib-icon.png maps? ( http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9e023dd046018c61c94840f52ace72b
diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
new file mode 100644
index 000000000000..c9d78b9e1a26
--- /dev/null
+++ b/app-misc/zygrib/Manifest
@@ -0,0 +1,10 @@
+AUX zygrib-8.0.1-libs.patch 628 BLAKE2B 44c0df4defbc2fd847e30a4fc3b8bee017a6b9419e25a43462a02bc8da6748f19692d305476443d2f8d6fcc65b8cb50f524792ea3033e19aecacbfc922937164 SHA512 c63d9c04ea2615179ebe6d7f627c4f5db39e757e6b8758da515f04cbd02263155729628d59625604cf2d6fef359d28446a40d4ebe2c7ae16752c9e1deaf8fb07
+AUX zygrib.desktop 210 BLAKE2B 0e340f8c9ae1da700e694ac2c0a973fc00264c4981376fd0aa67587a248f27f0940a80c9937cc71d52b42429d9ec891f3837344730706ca1adab4237d8df464d SHA512 fd88b992d248d0ad01374f291d792682e6ee2b5625fc792ba002f2d912bd2982c8d20aeb9bed5cf5e43a92344f1c580573e4bcf0f949cd6cebc09eff6e407b9d
+DIST zygrib-8.0.1.tgz 19759812 BLAKE2B f7f73cb54b18e510b0097fae27400efef081fb66f2bf361d5929d69c69087107ecb1d88fe83495571fe85edbd2464910776797e5c6700505acac9585951f0854 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
+DIST zygrib-cities_0-300.txt.gz 517620 BLAKE2B 74916674c84b171d34f882d15a244349940e2ccad5e408f7420484b400357945cc78339c2db70eb05b428f35f4b35695b9ec655a42a23779f66649e1b7432274 SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80
+DIST zygrib-cities_1k-3k.txt.gz 495119 BLAKE2B 16bfe2d5ff4c67c8e9858fa352aea23ae13ffa7668183d0cb3fe5e98cc6683e8a969c802c9297a29e9773dd471f233a900f2fca2e5e58f4090e0999107e9a72c SHA512 010d6688b9c381f0ace549c53a45f8bd43f1d6846dc01241ab7bfdf30b0629f39ef2a9a715c55a534634ad8480bc2edc2796a09f0c369406027f35f6b4ba8c08
+DIST zygrib-cities_300-1k.txt.gz 512733 BLAKE2B 2e480411ab8278c57f1368e809166820d9e1f5bf931e6eaf053a2448ec808b2b60d20ad5d5517cc590fc0c3c074b41a5b388856ea6145d5f6f5938d0ed50967e SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112
+DIST zygrib-icon.png 851 BLAKE2B 15a300726e4ee486aa49116fe7ca74b655fe316ef0c1fee116e83cd949d273744d7e76ed3f4d847a40d74e6bbaa0d3ace71fea2ad7cd86f041576b6ab986c698 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b
+DIST zygrib-maps2.4.tgz 105735981 BLAKE2B b3d666481d374cadc50ec979ed8a2ed9920bd80e2bf8a01dd2aded8a39df12e335515e84e666aeb8b01f37bc37126016bf8dc63d90a0492903c6436cf5c56a87 SHA512 0f10786ef81141299fd9550e36d976ce126b0d3523b56c10b19a839d56e17697ac93915b46f31d6691950f1e6d13c368fa1d198a5e2d830768fcb9e63034b487
+EBUILD zygrib-8.0.1-r1.ebuild 1983 BLAKE2B ed86ab57f6deb0cb36dc6ff4c18861742aa7ba91f188f74bd88b36327e998c616e4ec4f57b3e11a7bc6182db5d4c636a2d5cb2541871ad38fe4fa13323add507 SHA512 7729495b44ce3b8593eb1556cd33fe8151126360abcfc5943ebc301a56a7d02fd71aa4c6f0e83ce034c845fe56a35a74ec5b8d3a13bfd00fb10fe7f2edbde3a8
+MISC metadata.xml 337 BLAKE2B a1b4c21642a4ff8aef04e1d25f90b11c1b0917fc53fe706cfc56b4c2d6516a235d76d034a68393c472ba79b571c06be45b199083f29da867dd35170e0c639be1 SHA512 6d74d0109440f945eb9e224b5a81773348490beaa1f01e394749966e74b4d59b25c39a5e51c4de33bbaaf1ea4c3a59ef8d839d47fd66ddaeb01b075008e3356d
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
new file mode 100644
index 000000000000..b1a8937cc3cf
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -0,0 +1,20 @@
+--- src/zyGrib.pro.orig 2017-01-16 21:55:32.459388028 +0100
++++ src/zyGrib.pro 2017-01-16 22:17:18.509256966 +0100
+@@ -8,7 +8,7 @@
+ TARGET = zyGrib
+
+ DEPENDPATH += . util map GUI
+-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
++INCLUDEPATH += . util map GUI curvedrawer /usr/include/qwt6 g2clib
+
+ # ----------------------------------------------------
+ # platform specific
+@@ -35,7 +35,7 @@
+ }
+ }
+
+-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
++LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
+ LIBS += -Lg2clib -lg2c -lpng # respect order!
+
+ # ----------------------------------------------------
diff --git a/app-misc/zygrib/files/zygrib.desktop b/app-misc/zygrib/files/zygrib.desktop
new file mode 100644
index 000000000000..92873a1b87a5
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=zyGrib
+GenericName=GRIB File Viewer
+Comment=Weather data visualization
+Exec=/usr/bin/zygrib
+Terminal=false
+X-MultipleArgs=false
+Icon=zygrib
+Type=Application
+Categories=Network;
diff --git a/app-misc/zygrib/metadata.xml b/app-misc/zygrib/metadata.xml
new file mode 100644
index 000000000000..e3915286eb21
--- /dev/null
+++ b/app-misc/zygrib/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="maps">Installs additional GSHHS maps for high resolution coastline data and cities</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..8f7ba814d570
--- /dev/null
+++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+MY_PN="zyGrib"
+
+DESCRIPTION="GRIB File Viewer - Weather data visualization"
+HOMEPAGE="http://www.zygrib.org/"
+# zygrib.org has a DDoS protection and only allowd interactive downloads,
+# so we mirror the tarball...
+#SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz
+SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${MY_PN}-${PV}.tgz -> ${P}.tgz
+ https://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png
+ maps? (
+ http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz
+ http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz
+ http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz
+ http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz
+ )"
+
+LICENSE="GPL-3
+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+maps"
+
+DEPEND="app-arch/bzip2
+ dev-qt/qtsvg:5
+ media-libs/libpng:*
+ sci-libs/libnova
+ sci-libs/proj
+ sys-libs/zlib
+ x11-libs/qwt:6[qt5(+)]"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile
+ sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile
+ sed -i "/QWTDIR/d" Makefile
+ #use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
+ sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
+ sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro
+ epatch "${FILESDIR}/${P}-libs.patch"
+ default
+}
+
+src_install() {
+ default
+ rm zyGrib
+ doicon -s 32 "${DISTDIR}/zygrib-icon.png"
+ make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
+ domenu "${FILESDIR}/zygrib.desktop"
+
+ if use maps; then
+ insinto "/opt/${MY_PN}"
+ doins -r "${WORKDIR}/data"
+ insinto "/opt/${MY_PN}/data/gis"
+ gzip "${WORKDIR}"/*.txt
+ doins "${WORKDIR}"/*.txt.gz
+ fi
+}